ColorWidgets: more UI fixes

friction2d · Jul 14, 2024 · f9db662 · f9db662
1 parent 6bfc914
commit f9db662
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 11 deletions.
diff --git a/src/app/GUI/ColorWidgets/colorsettingswidget.cpp b/src/app/GUI/ColorWidgets/colorsettingswidget.cpp
@@ -246,15 +246,15 @@ void ColorSettingsWidget::moveAlphaWidgetToTab(const int tabId) {
     }/* else if(tabId == 3) {
         mWheelLayout->addLayout(hexLayout);
     }*/
-    for(int i=0;i < mTabWidget->count();i++)
+    /*for(int i=0;i < mTabWidget->count();i++)
         if(i!=tabId)
             mTabWidget->widget(i)->setSizePolicy(QSizePolicy::Minimum,
                                                  QSizePolicy::Ignored);
 
     mTabWidget->widget(tabId)->setSizePolicy(QSizePolicy::Minimum,
                                              QSizePolicy::Preferred);
     mTabWidget->widget(tabId)->resize(
-                mTabWidget->widget(tabId)->minimumSizeHint());
+                mTabWidget->widget(tabId)->minimumSizeHint());*/
 }
 
 void ColorSettingsWidget::startColorPicking() {
@@ -331,6 +331,9 @@ ColorSettingsWidget::ColorSettingsWidget(QWidget *parent)
     mRGBLayout->addLayout(bLayout);
     mRGBWidget->setLayout(mRGBLayout);
 
+    mRGBLayout->setContentsMargins(0, 0, 0, 0);
+    mRGBWidget->setContentsMargins(0, 0, 0, 0);
+
     hRect = new ColorValueRect(HUE_PROGRAM, this);
     hLayout->addWidget(hLabel);
     hLayout->addWidget(hRect);
@@ -349,6 +352,9 @@ ColorSettingsWidget::ColorSettingsWidget(QWidget *parent)
     mHSVLayout->addLayout(vLayout);
     mHSVWidget->setLayout(mHSVLayout);
 
+    mHSVLayout->setContentsMargins(0, 0, 0, 0);
+    mHSVWidget->setContentsMargins(0, 0, 0, 0);
+
     hslSatRect = new ColorValueRect(HSL_SATURATION_PROGRAM, this);
     hslSLayout->addWidget(hslSLabel);
     hslSLayout->addWidget(hslSatRect);
@@ -362,6 +368,9 @@ ColorSettingsWidget::ColorSettingsWidget(QWidget *parent)
     mHSLLayout->addLayout(lLayout);
     mHSLWidget->setLayout(mHSLLayout);
 
+    mHSLLayout->setContentsMargins(0, 0, 0, 0);
+    mHSLWidget->setContentsMargins(0, 0, 0, 0);
+
     aRect = new ColorValueRect(ALPHA_PROGRAM, this);
     aLayout->addWidget(aLabel);
     aLayout->addWidget(aRect);

diff --git a/src/app/GUI/ColorWidgets/colorsettingswidget.h b/src/app/GUI/ColorWidgets/colorsettingswidget.h
@@ -153,35 +153,35 @@ class ColorSettingsWidget : public QWidget {
     QLabel *rLabel = new QLabel("R");
     ColorValueRect *rRect = nullptr;
     QrealAnimatorValueSlider *rSpin =
-            new QrealAnimatorValueSlider(0., 1., 0.01, this);
+            new QrealAnimatorValueSlider(0., 1., 0.01, this, false);
     QHBoxLayout *gLayout = new QHBoxLayout();
     QLabel *gLabel = new QLabel("G");
     ColorValueRect *gRect = nullptr;
     QrealAnimatorValueSlider *gSpin =
-            new QrealAnimatorValueSlider(0., 1., 0.01, this);
+            new QrealAnimatorValueSlider(0., 1., 0.01, this, false);
     QHBoxLayout *bLayout = new QHBoxLayout();
     QLabel *bLabel = new QLabel("B");
     ColorValueRect *bRect = nullptr;
     QrealAnimatorValueSlider *bSpin =
-            new QrealAnimatorValueSlider(0., 1., 0.01, this);
+            new QrealAnimatorValueSlider(0., 1., 0.01, this, false);
 
     QWidget *mHSVWidget = new QWidget();
     QVBoxLayout *mHSVLayout = new QVBoxLayout();
     QHBoxLayout *hLayout = new QHBoxLayout();
     QLabel *hLabel = new QLabel("H");
     ColorValueRect *hRect = nullptr;
     QrealAnimatorValueSlider *hSpin =
-            new QrealAnimatorValueSlider(0., 1., 0.01, this);
+            new QrealAnimatorValueSlider(0., 1., 0.01, this, false);
     QHBoxLayout *hsvSLayout = new QHBoxLayout();
     QLabel *hsvSLabel = new QLabel("S");
     ColorValueRect *hsvSatRect = nullptr;
     QrealAnimatorValueSlider *hsvSSpin =
-            new QrealAnimatorValueSlider(0., 1., 0.01, this);
+            new QrealAnimatorValueSlider(0., 1., 0.01, this, false);
     QHBoxLayout *vLayout = new QHBoxLayout();
     QLabel *vLabel = new QLabel("V");
     ColorValueRect *vRect = nullptr;
     QrealAnimatorValueSlider *vSpin =
-            new QrealAnimatorValueSlider(0., 1., 0.01, this);
+            new QrealAnimatorValueSlider(0., 1., 0.01, this, false);
 
     QWidget *mHSLWidget = new QWidget();
     QVBoxLayout *mHSLLayout = new QVBoxLayout();
@@ -190,19 +190,19 @@ class ColorSettingsWidget : public QWidget {
     QLabel *hslSLabel = new QLabel("S");
     ColorValueRect *hslSatRect = nullptr;
     QrealAnimatorValueSlider *hslSSpin =
-            new QrealAnimatorValueSlider(0., 1., 0.01, this);
+            new QrealAnimatorValueSlider(0., 1., 0.01, this, false);
     QHBoxLayout *lLayout = new QHBoxLayout();
     QLabel *lLabel = new QLabel("L");
     ColorValueRect *lRect = nullptr;
     QrealAnimatorValueSlider *lSpin =
-            new QrealAnimatorValueSlider(0., 1., 0.01, this);
+            new QrealAnimatorValueSlider(0., 1., 0.01, this, false);
 
     bool mAlphaHidden = false;
     QHBoxLayout *aLayout = new QHBoxLayout();
     QLabel *aLabel = new QLabel("A");
     ColorValueRect *aRect = nullptr;
     QrealAnimatorValueSlider *aSpin =
-            new QrealAnimatorValueSlider(0., 1., 0.01, this);
+            new QrealAnimatorValueSlider(0., 1., 0.01, this, false);
 
     QHBoxLayout *hexLayout;
     QLineEdit *mHexEdit;

diff --git a/src/app/GUI/qrealanimatorvalueslider.cpp b/src/app/GUI/qrealanimatorvalueslider.cpp
@@ -38,6 +38,16 @@ QrealAnimatorValueSlider::QrealAnimatorValueSlider(qreal minVal, qreal maxVal,
 
 }
 
+QrealAnimatorValueSlider::QrealAnimatorValueSlider(qreal minVal,
+                                                   qreal maxVal,
+                                                   qreal prefferedStep,
+                                                   QWidget *parent,
+                                                   bool autoAdjust)
+    : QDoubleSlider(minVal, maxVal, prefferedStep, parent, autoAdjust)
+{
+
+}
+
 QrealAnimatorValueSlider::QrealAnimatorValueSlider(qreal minVal, qreal maxVal,
                                                    qreal prefferedStep,
                                                    QrealAnimator *animator,

diff --git a/src/app/GUI/qrealanimatorvalueslider.h b/src/app/GUI/qrealanimatorvalueslider.h
@@ -40,6 +40,8 @@ class QrealAnimatorValueSlider : public QDoubleSlider {
                              QWidget *parent);
     QrealAnimatorValueSlider(qreal minVal, qreal maxVal, qreal prefferedStep,
                              QWidget *parent);
+    QrealAnimatorValueSlider(qreal minVal, qreal maxVal, qreal prefferedStep,
+                             QWidget *parent, bool autoAdjust);
     QrealAnimatorValueSlider(qreal minVal, qreal maxVal, qreal prefferedStep,
                              QrealAnimator* animator, QWidget *parent = nullptr);
     QrealAnimatorValueSlider(QrealAnimator* animator, QWidget *parent = nullptr);

diff --git a/src/app/friction.qss b/src/app/friction.qss
@@ -130,6 +130,8 @@ QTabWidget::pane {
 QTabWidget#ColorTabWidget::pane {
     border-radius: unset;
     border: unset;
+    margin: 0;
+    padding: 0;
 }
 QTabWidget#ColorTabWidget QTabBar::tab {
     border-radius: 2%;