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

List:       kde-commits
Subject:    [krita] libs/ui/tool: Disable the brush size shortcuts when the brush size slider is disabled
From:       Nicholas LaPointe <null () kde ! org>
Date:       2018-01-01 3:25:34
Message-ID: E1eVqjG-0007cf-13 () code ! kde ! org
[Download RAW message or body]

Git commit de42bbe38647815d93be8d440d7000597333a841 by Nicholas LaPointe.
Committed on 01/01/2018 at 03:25.
Pushed by nicholasl into branch 'master'.

Disable the brush size shortcuts when the brush size slider is disabled

Differential Revision: https://phabricator.kde.org/D9279
CCBUG: 379958

M  +8    -5    libs/ui/tool/kis_tool_paint.cc

https://commits.kde.org/krita/de42bbe38647815d93be8d440d7000597333a841

diff --git a/libs/ui/tool/kis_tool_paint.cc b/libs/ui/tool/kis_tool_paint.cc
index 7f5009ebcc9..ecd9eb476f3 100644
--- a/libs/ui/tool/kis_tool_paint.cc
+++ b/libs/ui/tool/kis_tool_paint.cc
@@ -176,8 +176,10 @@ void KisToolPaint::activate(ToolActivation toolActivation, const \
QSet<KoShape*>  }
 
     KisTool::activate(toolActivation, shapes);
-    connect(action("increase_brush_size"), SIGNAL(triggered()), \
                SLOT(increaseBrushSize()), Qt::UniqueConnection);
-    connect(action("decrease_brush_size"), SIGNAL(triggered()), \
SLOT(decreaseBrushSize()), Qt::UniqueConnection); +    if (flags() & \
KisTool::FLAG_USES_CUSTOM_SIZE) { +        connect(action("increase_brush_size"), \
SIGNAL(triggered()), SLOT(increaseBrushSize()), Qt::UniqueConnection); +        \
connect(action("decrease_brush_size"), SIGNAL(triggered()), \
SLOT(decreaseBrushSize()), Qt::UniqueConnection); +    }
 
     KisCanvasResourceProvider *provider = \
qobject_cast<KisCanvas2*>(canvas())->viewManager()->resourceProvider();  m_oldOpacity \
= provider->opacity(); @@ -186,9 +188,10 @@ void \
KisToolPaint::activate(ToolActivation toolActivation, const QSet<KoShape*>  
 void KisToolPaint::deactivate()
 {
-
-    disconnect(action("increase_brush_size"), 0, this, 0);
-    disconnect(action("decrease_brush_size"), 0, this, 0);
+    if (flags() & KisTool::FLAG_USES_CUSTOM_SIZE) {
+        disconnect(action("increase_brush_size"), 0, this, 0);
+        disconnect(action("decrease_brush_size"), 0, this, 0);
+    }
 
     KisCanvasResourceProvider *provider = \
qobject_cast<KisCanvas2*>(canvas())->viewManager()->resourceProvider();  \
m_localOpacity = provider->opacity();


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