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

List:       kde-commits
Subject:    koffice/krita
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2010-10-18 16:53:19
Message-ID: 20101018165319.50D62AC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1187215 by langkamp:

fix scale layer for shape layers
CCBUG:251168


 M  +2 -2      plugins/extensions/imagesize/imagesize.cc  
 M  +4 -5      ui/kis_layer_manager.cc  


--- trunk/koffice/krita/plugins/extensions/imagesize/imagesize.cc #1187214:1187215
@@ -163,7 +163,7 @@
 
     KisConfig cfg;
 
-    KisPaintDeviceSP dev = m_view->activeDevice();
+    KisPaintDeviceSP dev = m_view->activeLayer()->projection();
     Q_ASSERT(dev);
     QRect rc = dev->exactBounds();
 
@@ -231,7 +231,7 @@
 void ImageSize::slotNodeChanged(const KisNodeSP node)
 {
     Q_UNUSED(node);
-    m_scaleLayerAction->setEnabled(m_view->activeDevice());
+    m_scaleLayerAction->setEnabled(m_view->activeLayer());
 }
 
 #include "imagesize.moc"
--- trunk/koffice/krita/ui/kis_layer_manager.cc #1187214:1187215
@@ -680,16 +680,15 @@
     KisLayerSP layer = activeLayer();
     if (!layer) return;
 
-    KisSelectedTransaction transaction(i18n("Scale Layer"), layer);
-
     KoProgressUpdater* updater = m_view->createProgressUpdater();
     KoUpdaterPtr u = updater->startSubtask();
 
-    KisTransformWorker worker(layer->paintDevice(), sx, sy, 0, 0, 0, 0, 0.0, 0, 0, u, filterStrategy);
-    worker.run();
+    m_view->image()->undoAdapter()->beginMacro(i18n("Scale Layer"));
 
-    transaction.commit(m_view->image()->undoAdapter());
+    KisTransformVisitor visitor(m_view->image(), sx, sy, 0.0, 0.0, 0.0, 0, 0, u, filterStrategy);
+    layer->accept(visitor);
 
+    m_view->image()->undoAdapter()->endMacro();
     m_doc->setModified(true);
     layersUpdated();
     m_view->canvas()->update();
[prev in list] [next in list] [prev in thread] [next in thread]