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

List:       kde-commits
Subject:    [calligra/krita-steam-ko] krita: Merge remote-tracking branch 'origin/master' into krita-steam-ko
From:       Stuart Dickson <stuartmd () kogmbh ! com>
Date:       2014-10-31 21:21:55
Message-ID: E1XkJdr-0004sf-SN () scm ! kde ! org
[Download RAW message or body]

Git commit d53c6b1dcd611ac579225667628bf1069d94d78b by Stuart Dickson.
Committed on 30/10/2014 at 20:03.
Pushed by dickson into branch 'krita-steam-ko'.

Merge remote-tracking branch 'origin/master' into krita-steam-ko

M  +1    -1    krita/CMakeLists.txt
M  +3    -2    krita/gemini/MainWindow.cpp
M  +1    -2    krita/sketch/KisSketchView.cpp
M  +27   -10   krita/ui/kis_view2.cpp
M  +1    -1    krita/ui/kis_view2.h
M  +3    -1    krita/ui/kis_zoom_manager.cc

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

diff --cc krita/ui/kis_view2.cpp
index 8a4d359,aa894e8..caf62bb
--- a/krita/ui/kis_view2.cpp
+++ b/krita/ui/kis_view2.cpp
@@@ -172,7 -175,7 +175,8 @@@ public
          , mainWindow(0)
          , tooltipManager(0)
          , showFloatingMessage(true)
 +        , isInCanvasOnlyMode(false)
+         , guiUpdateCompressor(0)
      {
      }
  
@@@ -235,7 -238,7 +239,8 @@@ public
      KisTooltipManager* tooltipManager;
      QPointer<KisFloatingMessage> savedFloatingMessage;
      bool showFloatingMessage;
 +    bool isInCanvasOnlyMode;
+     KisSignalCompressor* guiUpdateCompressor;
  };
  
  
diff --cc krita/ui/kis_zoom_manager.cc
index 8bfe9af,8489f07..9c15c8a
--- a/krita/ui/kis_zoom_manager.cc
+++ b/krita/ui/kis_zoom_manager.cc
@@@ -34,8 -34,7 +34,9 @@@
  #include <KoZoomHandler.h>
  #include <KoZoomController.h>
  #include <KoCanvasControllerWidget.h>
 +#include <KoGlobal.h>
 +#include <KoRulerController.h><<
+ #include <KoRulerController.h>
  #include <KoUnit.h>
  #include <KoDpi.h>
  
[prev in list] [next in list] [prev in thread] [next in thread]