[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/petrovic/theme-update] /: Only highlighted selected option on selection options and brush tip
From:       Scott Petrovic <null () kde ! org>
Date:       2017-12-31 19:41:45
Message-ID: E1eVjUP-0000jO-RC () code ! kde ! org
[Download RAW message or body]

Git commit 751f85013ff05fc846f9c9e68b6cfe2400efd8d6 by Scott Petrovic.
Committed on 31/12/2017 at 19:41.
Pushed by scottpetrovic into branch 'petrovic/theme-update'.

Only highlighted selected option on selection options and brush tip type

M  +6    -6    libs/ui/forms/wdgselectionoptions.ui
M  +20   -0    libs/widgetutils/KoGroupButton.cpp
M  +1    -1    plugins/paintops/libpaintop/kis_brush_selection_widget.cpp

https://commits.kde.org/krita/751f85013ff05fc846f9c9e68b6cfe2400efd8d6

diff --git a/libs/ui/forms/wdgselectionoptions.ui \
b/libs/ui/forms/wdgselectionoptions.ui index 4dbd5fdc203..4f5427e9c97 100644
--- a/libs/ui/forms/wdgselectionoptions.ui
+++ b/libs/ui/forms/wdgselectionoptions.ui
@@ -43,7 +43,7 @@
         <bool>true</bool>
        </property>
        <property name="autoRaise">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -59,7 +59,7 @@
         <bool>true</bool>
        </property>
        <property name="autoRaise">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -78,7 +78,7 @@
         <bool>true</bool>
        </property>
        <property name="autoRaise">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -94,7 +94,7 @@
         <bool>true</bool>
        </property>
        <property name="autoRaise">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -136,7 +136,7 @@
         <bool>true</bool>
        </property>
        <property name="autoRaise">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -152,7 +152,7 @@
         <bool>true</bool>
        </property>
        <property name="autoRaise">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
diff --git a/libs/widgetutils/KoGroupButton.cpp b/libs/widgetutils/KoGroupButton.cpp
index 77a51996a73..62bd7d9f66e 100644
--- a/libs/widgetutils/KoGroupButton.cpp
+++ b/libs/widgetutils/KoGroupButton.cpp
@@ -109,7 +109,27 @@ void KoGroupButton::paintEvent(QPaintEvent* event)
             panelOpt.palette = panelPal;
             painter.setOpacity(0.5);
         }
+    } else {
+
+        if (!isChecked() && !isDown() && !(panelOpt.state & \
QStyle::State_MouseOver)) { +
+        } else {
+             // only highlight the selected item
+            panelOpt.state |= (QStyle::State_On | QStyle::State_Sunken);
+            QPalette panelPal(panelOpt.palette);
+            QColor c;
+            c = panelPal.color(QPalette::Button);
+            c.setAlpha(50);
+            panelPal.setColor(QPalette::Button, c);
+            c = panelPal.color(QPalette::Window);
+            c.setAlpha(50);
+            panelPal.setColor(QPalette::Window, c);
+            panelOpt.palette = panelPal;
+            painter.setOpacity(0.5);
+        }
     }
+
+
     painter.drawPrimitive(QStyle::PE_PanelButtonTool, panelOpt);
     painter.setOpacity(1.0);
 
diff --git a/plugins/paintops/libpaintop/kis_brush_selection_widget.cpp \
b/plugins/paintops/libpaintop/kis_brush_selection_widget.cpp index \
                5ee4c64c208..64b81fd7a97 100644
--- a/plugins/paintops/libpaintop/kis_brush_selection_widget.cpp
+++ b/plugins/paintops/libpaintop/kis_brush_selection_widget.cpp
@@ -308,7 +308,7 @@ void KisBrushSelectionWidget::addChooser(const QString& text, \
QWidget* widget, i  KoGroupButton * button = new KoGroupButton(this);
     button->setGroupPosition(pos);
     button->setText(text);
-    button->setAutoRaise(true);
+    button->setAutoRaise(false);
     button->setCheckable(true);
     uiWdgBrushChooser.brushChooserButtonLayout->addWidget(button);
 


[prev in list] [next in list] [prev in thread] [next in thread]