Fix scaling issue with hidpi

Author: DamirPorobic

CMakeLists.txt

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

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.0
+Version 0.1.1
 
 ![kColorPicker](https://i.imgur.com/VkhUvFa.png "kColorPicker")
 

src/IconCreator.h

@@ -31,7 +31,7 @@ class IconCreator
 public:
 	explicit IconCreator() = delete;
 	~IconCreator() = delete;
-	static QIcon createIcon(const QColor &color, const QSize &size = QSize(25, 25));
+	static QIcon createIcon(const QColor &color, const QSize &size);
 };
 
 } // namespace kColorPicker

src/PopupMenu.cpp

@@ -76,10 +76,16 @@ void PopupMenu::generateGrid()
 
 ColorButton *PopupMenu::createButton(const QColor &color)
 {
-	auto icon = IconCreator::createIcon(color);
+	auto iconSize = getIconSize();
+	auto icon = IconCreator::createIcon(color, iconSize);
 	auto button = new ColorButton(icon, color);
 	return button;
 }
+QSize PopupMenu::getIconSize() const
+{ 	auto xScaleFactor = logicalDpiX() / 96.0;
+	auto yScaleFactor = logicalDpiY() / 96.0;
+	return {static_cast<int>(25 * xScaleFactor), static_cast<int>(25 * yScaleFactor) };
+}
 
 void PopupMenu::addColorButton(const QColor &color)
 {

src/PopupMenu.h

@@ -57,6 +57,7 @@ Q_OBJECT
 
 private slots:
 	void colorSelected(const QColor &color);
+	QSize getIconSize() const;
 };
 
 } // namespace kColorPicker

src/buttons/AbstractPopupMenuButton.cpp

@@ -23,10 +23,16 @@ namespace kColorPicker {
 
 AbstractPopupMenuButton::AbstractPopupMenuButton(const QIcon &icon)
 {
-    setIcon(icon);
-	setFixedSize(iconSize() + QSize(4,4));
+	setIcon(icon);
+	setFixedSize(getSizeBasedOnIcon());
     connect(this, &QToolButton::clicked, this, &AbstractPopupMenuButton::buttonClicked);
 }
+QSize AbstractPopupMenuButton::getSizeBasedOnIcon() const
+{
+	auto xScaleFactor = logicalDpiX() / 96.0;
+	auto yScaleFactor = logicalDpiY() / 96.0;
+	return iconSize() + QSize(static_cast<int>(4 * xScaleFactor), static_cast<int>(4 * yScaleFactor));
+}
 
 void AbstractPopupMenuButton::paintEvent(QPaintEvent *event)
 {

src/buttons/AbstractPopupMenuButton.h

@@ -39,6 +39,7 @@ Q_OBJECT
 protected slots:
 	void paintEvent(QPaintEvent *event) override;
 	virtual void buttonClicked() = 0;
+	QSize getSizeBasedOnIcon() const;
 };
 
 } // namespace kColorPicker