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

List:       kde-commits
Subject:    [calligra/krita_locking_langkamp] krita/ui: disconnect more from flake and let Krita do the UI updat
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2012-07-07 21:58:07
Message-ID: 20120707215807.B90B5A6094 () git ! kde ! org
[Download RAW message or body]

Git commit 2eb37cabbd8c2eacca7b67858298359ea0a821a1 by Sven Langkamp.
Committed on 07/07/2012 at 23:42.
Pushed by langkamp into branch 'krita_locking_langkamp'.

disconnect more from flake and let Krita do the UI update

M  +1    -1    krita/ui/flake/kis_node_shape.cpp
M  +2    -2    krita/ui/kis_node_manager.cpp
M  +5    -0    krita/ui/kis_view2.cpp
M  +1    -0    krita/ui/kis_view2.h

http://commits.kde.org/calligra/2eb37cabbd8c2eacca7b67858298359ea0a821a1

diff --git a/krita/ui/flake/kis_node_shape.cpp b/krita/ui/flake/kis_node_shape.cpp
index d181cf9..420c5bd 100644
--- a/krita/ui/flake/kis_node_shape.cpp
+++ b/krita/ui/flake/kis_node_shape.cpp
@@ -70,7 +70,7 @@ KisNodeSP KisNodeShape::node()
 void KisNodeShape::setNodeVisible(bool v)
 {
     // Necessary because shapes are not QObjects
-    setVisible(v);
+//     setVisible(v);
 }
 
 bool KisNodeShape::checkIfDescendant(KoShapeLayer *activeLayer)
diff --git a/krita/ui/kis_node_manager.cpp b/krita/ui/kis_node_manager.cpp
index aa6fb28..3c2a2ac 100644
--- a/krita/ui/kis_node_manager.cpp
+++ b/krita/ui/kis_node_manager.cpp
@@ -94,8 +94,8 @@ bool KisNodeManager::Private::activateNodeImpl(KisNodeSP node)
         KoShapeLayer * shapeLayer = dynamic_cast<KoShapeLayer*>(shape);
 
         Q_ASSERT(shapeLayer);
-        shapeLayer->setGeometryProtected(node->userLocked());
-        shapeLayer->setVisible(node->visible());
+//         shapeLayer->setGeometryProtected(node->userLocked());
+//         shapeLayer->setVisible(node->visible());
         selection->setActiveLayer(shapeLayer);
 
 
diff --git a/krita/ui/kis_view2.cpp b/krita/ui/kis_view2.cpp
index 97a7b54..76dde29 100644
--- a/krita/ui/kis_view2.cpp
+++ b/krita/ui/kis_view2.cpp
@@ -839,6 +839,7 @@ void KisView2::connectCurrentImage()
 
         connect(image(), SIGNAL(sigSizeChanged(qint32, qint32)), this, \
                SLOT(slotImageSizeChanged()));
         connect(image(), SIGNAL(sigResolutionChanged(double, double)), this, \
SLOT(slotImageSizeChanged())); +        connect(image(), \
                SIGNAL(sigNodeChanged(KisNodeSP)), this, SLOT(slotNodeChanged()));
         connect(image()->undoAdapter(), SIGNAL(selectionChanged()), \
selectionManager(), SLOT(selectionChanged()));  
         /**
@@ -919,6 +920,10 @@ void KisView2::slotImageSizeChanged()
     canvas()->update();
 }
 
+void KisView2::slotNodeChanged()
+{
+    updateGUI();
+}
 
 void KisView2::loadPlugins()
 {
diff --git a/krita/ui/kis_view2.h b/krita/ui/kis_view2.h
index d190530..6798ade 100644
--- a/krita/ui/kis_view2.h
+++ b/krita/ui/kis_view2.h
@@ -186,6 +186,7 @@ private slots:
     void slotPreferences();
     void slotEditPalette();
     void slotImageSizeChanged();
+    void slotNodeChanged();
     void slotTotalRefresh();
     void slotCreateTemplate();
     void slotDocumentSaved();


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