diff --git a/src/colorpicker/colorpickerscene.cpp b/src/colorpicker/colorpickerscene.cpp index 1f21fee..367d46b 100644 --- a/src/colorpicker/colorpickerscene.cpp +++ b/src/colorpicker/colorpickerscene.cpp @@ -20,11 +20,8 @@ ColorPickerScene::ColorPickerScene(QPixmap pixmap, QWidget *parentWidget) ScreenOverlay::show(); } -void ColorPickerScene::mouseMoved(QGraphicsSceneMouseEvent *, QPointF cursorPos, QPointF) { - color = image.pixelColor(cursorPos.toPoint()); -} - void ColorPickerScene::keyPressEvent(QKeyEvent *event) { + color = image.pixelColor(cursorPos().toPoint()); if (event->key() == Qt::Key_Return) { QApplication::clipboard()->setText(color.name()); qInfo().noquote() << tr("Copied hex code to clipboard."); @@ -33,11 +30,13 @@ void ColorPickerScene::keyPressEvent(QKeyEvent *event) { } void ColorPickerScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *) { + color = image.pixelColor(cursorPos().toPoint()); QApplication::clipboard()->setText(color.name()); close(); qInfo().noquote() << tr("Copied hex code to clipboard."); } QString ColorPickerScene::generateHint() { + color = image.pixelColor(cursorPos().toPoint()); return color.name(); } diff --git a/src/colorpicker/colorpickerscene.hpp b/src/colorpicker/colorpickerscene.hpp index da0d5ab..db8529d 100644 --- a/src/colorpicker/colorpickerscene.hpp +++ b/src/colorpicker/colorpickerscene.hpp @@ -17,13 +17,12 @@ public: ColorPickerScene(QPixmap pixmap, QWidget *parent = nullptr); void keyPressEvent(QKeyEvent *event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent *) override; - QString generateHint() override; static void showPicker() { new ColorPickerScene(utils::fullscreen()); } protected: - void mouseMoved(QGraphicsSceneMouseEvent *, QPointF cursorPos, QPointF) override; + QString generateHint() override; private: QImage image;