Minor cleanup

friction2d · Jun 30, 2024 · 06ec2e5 · 06ec2e5
1 parent 879dc34
commit 06ec2e5
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 27 deletions.
diff --git a/src/app/GUI/ColorWidgets/colorsettingswidget.cpp b/src/app/GUI/ColorWidgets/colorsettingswidget.cpp
@@ -369,7 +369,6 @@ ColorSettingsWidget::ColorSettingsWidget(QWidget *parent)
 
     mPickingButton = new QPushButton(QIcon::fromTheme("pick"), QString(), this);
     mPickingButton->setFocusPolicy(Qt::NoFocus);
-    //mPickingButton->setObjectName("FlatButton");
     mPickingButton->setToolTip(tr("Pick Color"));
     connect(mPickingButton, &QPushButton::released,
             this, &ColorSettingsWidget::startColorPicking);

diff --git a/src/app/GUI/RenderWidgets/renderwidget.cpp b/src/app/GUI/RenderWidgets/renderwidget.cpp
@@ -71,7 +71,6 @@ RenderWidget::RenderWidget(QWidget *parent)
     mStartRenderButton = new QPushButton(QIcon::fromTheme("render_animation"),
                                          tr("Render"),
                                          this);
-    //mStartRenderButton->setObjectName("FlatButton");
     mStartRenderButton->setFocusPolicy(Qt::NoFocus);
     mStartRenderButton->setSizePolicy(QSizePolicy::Preferred,
                                       QSizePolicy::Preferred);
@@ -81,7 +80,6 @@ RenderWidget::RenderWidget(QWidget *parent)
     mStopRenderButton = new QPushButton(QIcon::fromTheme("cancel"),
                                         QString(),
                                         this);
-    //mStopRenderButton->setObjectName("FlatButton");
     mStopRenderButton->setToolTip(tr("Stop Rendering"));
     mStopRenderButton->setFocusPolicy(Qt::NoFocus);
     mStopRenderButton->setSizePolicy(QSizePolicy::Preferred,
@@ -93,7 +91,6 @@ RenderWidget::RenderWidget(QWidget *parent)
     mAddRenderButton = new QPushButton(QIcon::fromTheme("plus"),
                                        QString(),
                                        this);
-    //mAddRenderButton->setObjectName("FlatButton");
     mAddRenderButton->setToolTip(tr("Add current scene to queue"));
     mAddRenderButton->setFocusPolicy(Qt::NoFocus);
     mAddRenderButton->setSizePolicy(QSizePolicy::Preferred,
@@ -106,7 +103,6 @@ RenderWidget::RenderWidget(QWidget *parent)
     mClearQueueButton = new QPushButton(QIcon::fromTheme("trash"),
                                         QString(),
                                         this);
-    //mClearQueueButton->setObjectName("FlatButton");
     mClearQueueButton->setToolTip(tr("Clear Queue"));
     mClearQueueButton->setFocusPolicy(Qt::NoFocus);
     mClearQueueButton->setSizePolicy(QSizePolicy::Preferred,
@@ -115,10 +111,6 @@ RenderWidget::RenderWidget(QWidget *parent)
             this, &RenderWidget::clearRenderQueue);
 
     eSizesUI::widget.add(mStartRenderButton, [this](const int size) {
-        //mStartRenderButton->setFixedHeight(size);
-        //mStopRenderButton->setFixedSize(QSize(size, size));
-        //mAddRenderButton->setFixedSize(QSize(size, size));
-        //mClearQueueButton->setFixedSize(QSize(size, size));
         if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
             mStartRenderButton->setIconSize(QSize(size, size));
             mStopRenderButton->setIconSize(QSize(size, size));

diff --git a/src/app/GUI/Settings/settingsdialog.cpp b/src/app/GUI/Settings/settingsdialog.cpp
@@ -54,29 +54,22 @@ SettingsDialog::SettingsDialog(QWidget * const parent)
                                                tr("Restore Defaults"),
                                                this);
     restoreButton->setFocusPolicy(Qt::NoFocus);
-    //restoreButton->setObjectName("FlatButton");
 
     const auto cancelButton = new QPushButton(QIcon::fromTheme("dialog-cancel"),
                                               tr("Close"),
                                               this);
     cancelButton->setFocusPolicy(Qt::NoFocus);
-    //cancelButton->setObjectName("FlatButton");
 
     const auto applyButton = new QPushButton(QIcon::fromTheme("disk_drive"),
                                              tr("Save"),
                                              this);
     applyButton->setFocusPolicy(Qt::NoFocus);
-    //applyButton->setObjectName("FlatButton");
 
     buttonsLayout->addWidget(restoreButton);
     buttonsLayout->addStretch();
     buttonsLayout->addWidget(applyButton);
     buttonsLayout->addWidget(cancelButton);
 
-    /*restoreButton->setFixedHeight(eSizesUI::widget);
-    cancelButton->setFixedHeight(eSizesUI::widget);
-    applyButton->setFixedHeight(eSizesUI::widget);*/
-
     if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
         restoreButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
         cancelButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));

diff --git a/src/app/GUI/qrealanimatorvalueslider.cpp b/src/app/GUI/qrealanimatorvalueslider.cpp
@@ -180,7 +180,7 @@ void QrealAnimatorValueSlider::paint(QPainter *p) {
         }
         if(!textEditing() && mTarget->hasExpression()) {
             if(mTarget->hasValidExpression()) {
-                p->setBrush(/*QColor(0, 125, 255)*/ThemeSupport::getThemeHighlightColor());
+                p->setBrush(ThemeSupport::getThemeHighlightColor());
             } else {
                 p->setBrush(QColor(255, 125, 0));
             }

diff --git a/src/ui/widgets/framescrollbar.cpp b/src/ui/widgets/framescrollbar.cpp
@@ -119,14 +119,6 @@ void FrameScrollBar::paintEvent(QPaintEvent *) {
     handleRect.setWidth(mBottom ? handleWidth : handleFixedWidth);
     handleRect.setBottom(mBottom ? 6 : height()/3);
     if (mRange) { p.fillRect(handleRect, col); }
-    /*else { // triangle
-        QPainterPath path;
-        path.moveTo(handleRect.left() + (handleRect.width() / 2), handleRect.bottom());
-        path.lineTo(handleRect.topLeft());
-        path.lineTo(handleRect.topRight());
-        path.lineTo(handleRect.left() + (handleRect.width() / 2), handleRect.bottom());
-        p.fillPath(path, ThemeSupport::getThemeHighlightColor());
-    }*/
 
     // draw the stuff ...
     if (!mRange) {

diff --git a/src/ui/widgets/qdoubleslider.cpp b/src/ui/widgets/qdoubleslider.cpp
@@ -180,8 +180,8 @@ void QDoubleSlider::setValueRange(const qreal min, const qreal max) {
 }
 
 void QDoubleSlider::paint(QPainter * const p, const bool enabled) {
-    paint(p, enabled ? /*QColor(255, 255, 255)*/ThemeSupport::getThemeButtonBaseColor() : /*QColor(220, 220, 220)*/ThemeSupport::getThemeAlternateColor(),
-          enabled ? /*QColor(220, 220, 220)*/ThemeSupport::getThemeButtonBorderColor(150) : /*QColor(200, 200, 200)*/ThemeSupport::getThemeBaseColor(),
+    paint(p, enabled ? ThemeSupport::getThemeButtonBaseColor() : ThemeSupport::getThemeAlternateColor(),
+          enabled ? ThemeSupport::getThemeButtonBorderColor(150) : ThemeSupport::getThemeBaseColor(),
           enabled ? ThemeSupport::getThemeButtonBorderColor() : Qt::darkGray,
           enabled ? Qt::white : Qt::darkGray);
 }