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

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra/layer=5Fbox=5Fcleaning=5Fkazakov=5D_krita/?=
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2011-03-20 7:24:46
Message-ID: 20110320072446.339F6A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit e5610e64446c9a63cfa6f105aa164a61e5fc99a2 by Dmitry Kazakov.
Committed on 20/03/2011 at 07:49.
Pushed by dkazakov into branch 'layer_box_cleaning_kazakov'.

Fixed cold initialization of KisNodeModel

Cold initialization of the active node should be done after
KisNodeModel::setImage() call happened. Otherwise indexFromNode(node)
will not work.

Removed explicit node activation in up/down buttons slots. Update
signals are coming from KisNodeManager again, so they are not needed
anymore.

M  +4    -4    krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp     

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

diff --git a/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp \
b/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp index \
                b66cb18..9fda646 100644
--- a/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
+++ b/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
@@ -203,7 +203,7 @@ void KisLayerBox::setImage(KisImageWSP image)
             m_nodeManager->disconnect(this);
         }
         m_nodeManager = m_canvas->view()->nodeManager();
-
+        m_nodeModel->setImage(m_image);
         connect(m_image, SIGNAL(sigAboutToBeDeleted()), SLOT(notifyImageDeleted()));
 
         // cold start
@@ -216,8 +216,10 @@ void KisLayerBox::setImage(KisImageWSP image)
         connect(m_nodeModel, SIGNAL(requestMoveNode(KisNodeSP, KisNodeSP)), \
                m_nodeManager, SLOT(moveNode(KisNodeSP, KisNodeSP)));
         connect(m_nodeModel, SIGNAL(requestMoveNode(KisNodeSP, KisNodeSP, int)), \
m_nodeManager, SLOT(moveNodeAt(KisNodeSP, KisNodeSP, int)));  }
+    else {
+        m_nodeModel->setImage(m_image);
+    }
 
-    m_nodeModel->setImage(m_image);
     m_wdgLayerBox->listLayers->expandAll();
     m_wdgLayerBox->listLayers->scrollToBottom();
 }
@@ -411,13 +413,11 @@ void KisLayerBox::slotRmClicked()
 void KisLayerBox::slotRaiseClicked()
 {
     m_nodeManager->raiseNode();
-    setCurrentNode(m_nodeManager->activeNode());
 }
 
 void KisLayerBox::slotLowerClicked()
 {
     m_nodeManager->lowerNode();
-    setCurrentNode(m_nodeManager->activeNode());
 }
 
 void KisLayerBox::slotPropertiesClicked()


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