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

List:       kde-commits
Subject:    [calligra/calligra/2.9] krita/ui: removed rogue function that was overriding theme colors. creating 
From:       Scott Petrovic <scottpetrovic () gmail ! com>
Date:       2015-01-10 19:07:32
Message-ID: E1YA1Nk-000801-Kw () scm ! kde ! org
[Download RAW message or body]

Git commit beff8768c97f027f433c01cca2aa6a812c752aca by Scott Petrovic.
Committed on 10/01/2015 at 19:06.
Pushed by scottpetrovic into branch 'calligra/2.9'.

removed rogue function that was overriding theme colors. creating an odd lo=
ok to it

M  +0    -15   krita/ui/kis_paintop_box.cc
M  +0    -2    krita/ui/kis_paintop_box.h

http://commits.kde.org/calligra/beff8768c97f027f433c01cca2aa6a812c752aca

diff --git a/krita/ui/kis_paintop_box.cc b/krita/ui/kis_paintop_box.cc
index 35d8578..fef1728 100644
--- a/krita/ui/kis_paintop_box.cc
+++ b/krita/ui/kis_paintop_box.cc
@@ -786,8 +786,6 @@ void KisPaintopBox::slotToggleEraseMode(bool checked)
     m_sliderChooser[1]->getWidget<KisDoubleSliderSpinBox>("size")->setValu=
e(updateSize);
     m_sliderChooser[2]->getWidget<KisDoubleSliderSpinBox>("size")->setValu=
e(updateSize);
 =

-
-    toggleHighlightedButton(m_eraseModeButton);
 }
 =

 void KisPaintopBox::slotSetCompositeMode(int index)
@@ -803,13 +801,11 @@ void KisPaintopBox::slotSetCompositeMode(int index)
 void KisPaintopBox::slotHorizontalMirrorChanged(bool value)
 {
     m_resourceProvider->setMirrorHorizontal(value);
-    toggleHighlightedButton(hMirrorButton);
 }
 =

 void KisPaintopBox::slotVerticalMirrorChanged(bool value)
 {
     m_resourceProvider->setMirrorVertical(value);
-    toggleHighlightedButton(vMirrorButton);
 }
 =

 void KisPaintopBox::sliderChanged(int n)
@@ -978,20 +974,9 @@ void KisPaintopBox::slotToggleAlphaLockMode(bool check=
ed)
     } else {
         m_alphaLockButton->actions()[0]->setIcon(koIcon("transparency-unlo=
cked"));
     }
-    toggleHighlightedButton(m_alphaLockButton);
     m_resourceProvider->setGlobalAlphaLock(checked);
 }
 =

-
-void KisPaintopBox::toggleHighlightedButton(QToolButton* m_tool)
-{
-    palette_highlight.setColor(QPalette::Button, palette.color(QPalette::H=
ighlight));
-
-    if (m_tool->isChecked())
-        m_tool->setPalette(this->palette_highlight);
-    else
-        m_tool->setPalette(this->palette);
-}
 void KisPaintopBox::slotReloadPreset()
 {
     KisSignalsBlocker blocker(m_optionWidget);
diff --git a/krita/ui/kis_paintop_box.h b/krita/ui/kis_paintop_box.h
index 01d96fa..57da219 100644
--- a/krita/ui/kis_paintop_box.h
+++ b/krita/ui/kis_paintop_box.h
@@ -154,8 +154,6 @@ private slots:
     void slotUnsetEraseMode();
     void slotToggleAlphaLockMode(bool);
 =

-    void toggleHighlightedButton(QToolButton* m_tool);
-
     void slotReloadPreset();
     void slotConfigurationItemChanged();
     void slotSaveLockedOptionToPreset(KisPropertiesConfiguration* p);
[prev in list] [next in list] [prev in thread] [next in thread]