Add method for fetching selected color

Author: DamirPorobic

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(kColorPicker LANGUAGES CXX VERSION 0.0.1)
+project(kColorPicker LANGUAGES CXX VERSION 0.1.0)
 
 set(QT_MIN_VERSION "5.6.1")
 

README.md

@@ -1,7 +1,7 @@
 # kColorPicker [![Build Status](https://travis-ci.org/DamirPorobic/kColorPicker.svg?branch=master)](https://travis-ci.org/DamirPorobic/kColorPicker)
 QToolButton with color popup menu with lets you select a color. The popup features a color dialog button which can be used to add custom colors to the popup menu.
 
-Version 0.0.1
+Version 0.1.0
 
 ![kColorPicker](https://i.imgur.com/VkhUvFa.png "kColorPicker")
 

include/kColorPicker/KColorPicker.h

@@ -38,9 +38,10 @@ Q_OBJECT
 
 public:
 	explicit KColorPicker();
-	~KColorPicker();
+	~KColorPicker() override;
 	void setFixedSize(const QSize &size);
 	void setFixedSize(int width, int height);
+	QColor color() const;
 
 public slots:
 	void setColor(const QColor &color);

src/KColorPicker.cpp

@@ -52,12 +52,15 @@ KColorPicker::~KColorPicker()
 void KColorPicker::setColor(const QColor &color)
 {
 	Q_D(KColorPicker);
+	d->mSelectedColor = color;
 	setColorIcon(color);
 	d->mPopupMenu.selectColor(color);
 }
 
 void KColorPicker::colorSelected(const QColor &color)
 {
+	Q_D(KColorPicker);
+	d->mSelectedColor = color;
 	setColorIcon(color);
 	emit colorChanged(color);
 }
@@ -78,6 +81,12 @@ void KColorPicker::setFixedSize(int width, int height)
 	setColorIcon(d->mSelectedColor);
 }
 
+QColor KColorPicker::color() const
+{
+	Q_D(const KColorPicker);
+	return d->mSelectedColor;
+}
+
 void KColorPicker::setIconSize(const QSize &size)
 {
 	Q_D(KColorPicker);

src/PopupMenu.h

@@ -35,7 +35,7 @@ class PopupMenu : public QMenu
 Q_OBJECT
 public:
 	PopupMenu();
-	~PopupMenu();
+	~PopupMenu() override;
 	void addColor(const QColor &color);
 	void selectColor(const QColor &color);
 

src/buttons/AbstractPopupMenuButton.h

@@ -37,7 +37,7 @@ Q_OBJECT
 	void colorSelected(const QColor &color) const;
 
 protected slots:
-	virtual void paintEvent(QPaintEvent *event);
+	void paintEvent(QPaintEvent *event) override;
 	virtual void buttonClicked() = 0;
 };
 

src/buttons/ColorButton.h

@@ -32,7 +32,7 @@ Q_OBJECT
 	QColor color() const;
 
 protected:
-	virtual void buttonClicked();
+	void buttonClicked() override;
 
 private:
 	QColor mColor;

src/buttons/ColorDialogButton.h

@@ -30,10 +30,10 @@ class ColorDialogButton : public AbstractPopupMenuButton
 {
 Q_OBJECT
 public:
-	ColorDialogButton(const QIcon &icon);
+	explicit ColorDialogButton(const QIcon &icon);
 
 protected:
-	virtual void buttonClicked();
+	void buttonClicked() override;
 
 };