Fix popup menu out of screen

Author: DamirPorobic

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(kColorPicker LANGUAGES CXX VERSION 0.1.5)
+project(kColorPicker LANGUAGES CXX VERSION 0.1.6)
 
 set(QT_MIN_VERSION "5.9.4")
 

README.md

@@ -1,7 +1,7 @@
 # kColorPicker [![Build Status](https://travis-ci.org/ksnip/kColorPicker.svg?branch=master)](https://travis-ci.org/ksnip/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.1.5
+Version 0.1.6
 
 ![kColorPicker](https://i.imgur.com/VkhUvFa.png "kColorPicker")
 

src/PopupMenu.cpp

@@ -21,14 +21,17 @@
 
 namespace kColorPicker {
 
-PopupMenu::PopupMenu()
+PopupMenu::PopupMenu() :
+	mButtonGroup(new QButtonGroup()),
+	mLayout(new QGridLayout()),
+	mColorDialogButton(new ColorDialogButton(QIcon(QLatin1String(":/icons/ellipsis"))))
 {
-	mButtonGroup = new QButtonGroup();
-	mLayout = new QGridLayout();
+
 	mLayout->setSpacing(0);
 	mLayout->setMargin(5);
 	setLayout(mLayout);
-	addColorDialogButton();
+
+	connect(mColorDialogButton, &AbstractPopupMenuButton::colorSelected, this, &PopupMenu::colorSelected);
 }
 
 PopupMenu::~PopupMenu()
@@ -114,11 +117,9 @@ void PopupMenu::colorSelected(const QColor &color)
 	hide();
 }
 
-void PopupMenu::addColorDialogButton()
+QSize PopupMenu::sizeHint() const
 {
-	auto icon = QIcon(QLatin1String(":/icons/ellipsis"));
-	mColorDialogButton = new ColorDialogButton(icon);
-	connect(mColorDialogButton, &AbstractPopupMenuButton::colorSelected, this, &PopupMenu::colorSelected);
+	return mLayout->sizeHint();
 }
 
 } // namespace kColorPicker

src/PopupMenu.h

@@ -38,6 +38,7 @@ Q_OBJECT
 	~PopupMenu() override;
 	void addColor(const QColor &color);
 	void selectColor(const QColor &color);
+	QSize sizeHint() const;
 
 signals:
 	void colorChanged(const QColor &color) const;
@@ -49,9 +50,8 @@ Q_OBJECT
 	ColorDialogButton *mColorDialogButton;
 
 	void generateGrid();
-	ColorButton *createButton(const QColor &color);
+	static ColorButton *createButton(const QColor &color);
 	void addColorButton(const QColor &color);
-	void addColorDialogButton();
 	void clearGrid();
 	bool isColorInGrid(const QColor &color);