summaryrefslogtreecommitdiffstats
path: root/src/pixeltool
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2019-10-21 23:25:07 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-10-28 18:22:05 +0200
commita339e4a1e3b53d852c1e6a445e3159dbd8bc0e80 (patch)
treea27b00b3bb05a2f7d8962220f9260b4b534bdbe1 /src/pixeltool
parentc0d30fae55ce89d957f8a2e9cf18a07d9bc9a83e (diff)
pixeltool: Show color under mouse in the window title
Hint which color will be picked when pressing 'c'. Change-Id: If48392b288732b30d88bff18b3a3bbf5074947ed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/pixeltool')
-rw-r--r--src/pixeltool/qpixeltool.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp
index 81923d1ed..b41f5e942 100644
--- a/src/pixeltool/qpixeltool.cpp
+++ b/src/pixeltool/qpixeltool.cpp
@@ -493,7 +493,7 @@ QSize QPixelTool::sizeHint() const
return m_initialSize;
}
-static inline QString pixelToolTitle(QPoint pos)
+static inline QString pixelToolTitle(QPoint pos, const QColor &currentColor)
{
if (QHighDpiScaling::isActive()) {
if (auto screen = QGuiApplication::screenAt(pos))
@@ -501,7 +501,8 @@ static inline QString pixelToolTitle(QPoint pos)
}
return QCoreApplication::applicationName() + QLatin1String(" [")
+ QString::number(pos.x())
- + QLatin1String(", ") + QString::number(pos.y()) + QLatin1Char(']');
+ + QLatin1String(", ") + QString::number(pos.y()) + QLatin1String("] ")
+ + currentColor.name();
}
void QPixelTool::grabScreen()
@@ -519,7 +520,7 @@ void QPixelTool::grabScreen()
return;
if (m_lastMousePos != mousePos)
- setWindowTitle(pixelToolTitle(mousePos));
+ setWindowTitle(pixelToolTitle(mousePos, m_currentColor));
int w = int(width() / float(m_zoom));
int h = int(height() / float(m_zoom));