From ef77af5da76140e96896cb9e5689e1466d0d2757 Mon Sep 17 00:00:00 2001 From: flora Date: Tue, 27 Dec 2022 15:33:26 +0100 Subject: [PATCH] Promoted sliders to QTooltipedSliders --- OpenRGB.pro | 2 ++ qt/OpenRGBDevicePage.ui | 9 +++++++-- qt/OpenRGBZoneResizeDialog.ui | 11 +++++++++-- qt/QTooltipedSlider.cpp | 10 ++++++++++ qt/QTooltipedSlider.h | 14 ++++++++++++++ 5 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 qt/QTooltipedSlider.cpp create mode 100644 qt/QTooltipedSlider.h diff --git a/OpenRGB.pro b/OpenRGB.pro index a0783375..3c0f84fe 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -238,6 +238,7 @@ HEADERS += qt/OpenRGBYeelightSettingsPage/OpenRGBYeelightSettingsEntry.h \ qt/OpenRGBYeelightSettingsPage/OpenRGBYeelightSettingsPage.h \ qt/OpenRGBZonesBulkResizer.h \ + qt/QTooltipedSlider.h \ qt/TabLabel.h \ serial_port/find_usb_serial_port.h \ serial_port/serial_port.h \ @@ -729,6 +730,7 @@ SOURCES += qt/OpenRGBThemeManager.cpp \ qt/OpenRGBZoneResizeDialog.cpp \ qt/OpenRGBZonesBulkResizer.cpp \ + qt/QTooltipedSlider.cpp \ qt/TabLabel.cpp \ qt/hsv.cpp \ qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp \ diff --git a/qt/OpenRGBDevicePage.ui b/qt/OpenRGBDevicePage.ui index 44d0381b..4c3149aa 100644 --- a/qt/OpenRGBDevicePage.ui +++ b/qt/OpenRGBDevicePage.ui @@ -226,7 +226,7 @@ - + Qt::Horizontal @@ -302,7 +302,7 @@ - + Qt::Horizontal @@ -392,6 +392,11 @@ currentColorInput(QColor) + + QTooltipedSlider + QSlider +
QTooltipedSlider.h
+
ZoneBox diff --git a/qt/OpenRGBZoneResizeDialog.ui b/qt/OpenRGBZoneResizeDialog.ui index 9abf5d37..c4af0430 100644 --- a/qt/OpenRGBZoneResizeDialog.ui +++ b/qt/OpenRGBZoneResizeDialog.ui @@ -7,7 +7,7 @@ 0 0 233 - 71 + 73 @@ -15,7 +15,7 @@ - + 0 @@ -55,6 +55,13 @@
+ + + QTooltipedSlider + QSlider +
QTooltipedSlider.h
+
+
diff --git a/qt/QTooltipedSlider.cpp b/qt/QTooltipedSlider.cpp new file mode 100644 index 00000000..97bdfe07 --- /dev/null +++ b/qt/QTooltipedSlider.cpp @@ -0,0 +1,10 @@ +#include "QTooltipedSlider.h" +#include + +QTooltipedSlider::QTooltipedSlider(QWidget *parent) : + QSlider(parent) +{ + connect(this, &QSlider::sliderMoved,[&](int value) { + QToolTip::showText(QCursor::pos(), QString("%1").arg(value), nullptr); + }); +} diff --git a/qt/QTooltipedSlider.h b/qt/QTooltipedSlider.h new file mode 100644 index 00000000..95e67426 --- /dev/null +++ b/qt/QTooltipedSlider.h @@ -0,0 +1,14 @@ +#ifndef QTOOLTIPEDSLIDER_H +#define QTOOLTIPEDSLIDER_H + +#include + +class QTooltipedSlider : public QSlider +{ + Q_OBJECT + +public: + explicit QTooltipedSlider(QWidget *parent = nullptr); +}; + +#endif // QTOOLTIPEDSLIDER_H