Theme minor

friction2d · Aug 12, 2024 · fd48e2d · fd48e2d
1 parent b8ddcde
commit fd48e2d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/src/app/GUI/timelinedockwidget.cpp b/src/app/GUI/timelinedockwidget.cpp
@@ -233,10 +233,8 @@ TimelineDockWidget::TimelineDockWidget(Document& document,
     mToolBar->addWidget(mFrameStartSpin);
 
     eSizesUI::widget.add(mToolBar, [this](const int size) {
-        Q_UNUSED(size)
         //mRenderProgress->setFixedHeight(eSizesUI::button);
-        //mToolBar->setFixedHeight(eSizesUI::button);
-        mToolBar->setIconSize(QSize(eSizesUI::button, eSizesUI::button));
+        mToolBar->setIconSize(QSize(size, size));
     });
 
     QWidget *spacerWidget1 = new QWidget(this);

diff --git a/src/app/GUI/toolbox.cpp b/src/app/GUI/toolbox.cpp
@@ -39,10 +39,9 @@ void MainWindow::setupToolBox()
     setupToolBoxDraw();
 
     eSizesUI::widget.add(mToolBoxMain, [this](const int size) {
-        Q_UNUSED(size)
-        mToolBoxMain->setIconSize(QSize(eSizesUI::button, eSizesUI::button));
-        mToolBoxNodes->setIconSize(QSize(eSizesUI::button, eSizesUI::button));
-        mToolBoxDraw->setIconSize(QSize(eSizesUI::button, eSizesUI::button));
+        mToolBoxMain->setIconSize(QSize(size, size));
+        mToolBoxNodes->setIconSize(QSize(size, size));
+        mToolBoxDraw->setIconSize(QSize(size, size));
     });
 
     mToolBoxMainIndex = mToolBoxStack->addWidget(mToolBoxMain);

diff --git a/src/core/MovablePoints/boxpathpoint.cpp b/src/core/MovablePoints/boxpathpoint.cpp
@@ -60,8 +60,8 @@ void BoxPathPoint::drawSk(SkCanvas * const canvas, const CanvasMode mode,
     Q_UNUSED(ctrlPressed)
     const SkPoint absPos = toSkPoint(getAbsolutePos());
     const SkColor fillCol = isSelected() ?
-                toSkColor(ThemeSupport::getThemeColorRed()) :
-                toSkColor(ThemeSupport::getThemeColorOrange());
+                toSkColor(ThemeSupport::getThemeColorRed(155)) :
+                toSkColor(ThemeSupport::getThemeColorOrange(155));
     drawOnAbsPosSk(canvas, absPos, invScale, fillCol);
 
     /*canvas->save();

diff --git a/src/core/MovablePoints/pathpivot.cpp b/src/core/MovablePoints/pathpivot.cpp
@@ -46,8 +46,8 @@ void PathPivot::drawSk(SkCanvas * const canvas,
     //const SkPoint absPos = toSkPoint(getAbsolutePos());
     if(isVisible(mode)) {
         const SkColor fillCol = isSelected() ?
-                    toSkColor(ThemeSupport::getThemeColorBlue()) :
-                    toSkColor(ThemeSupport::getThemeColorGreen());
+                    toSkColor(ThemeSupport::getThemeColorBlue(155)) :
+                    toSkColor(ThemeSupport::getThemeColorGreen(155));
         const SkPoint absPos = toSkPoint(getAbsolutePos());
         drawOnAbsPosSk(canvas, absPos, invScale, fillCol);
     }