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

List:       kde-commits
Subject:    [calligra/calligra/2.6] plugins/textshape: Fix clicking in a selection does not update the caret.
From:       Pierre Stirnweiss <pstirnweiss () googlemail ! com>
Date:       2012-12-23 12:55:36
Message-ID: 20121223125536.9D233A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 7b636db7f49007b3b6f370cef7cef2d62cdf1edc by Pierre Stirnweiss.
Committed on 23/12/2012 at 13:31.
Pushed by pstirnweiss into branch 'calligra/2.6'.

Fix clicking in a selection does not update the caret.

Initialize m_drag in the TextTool solves the problem somehow.

REVIEW: 107849

M  +20   -19   plugins/textshape/TextTool.cpp

http://commits.kde.org/calligra/7b636db7f49007b3b6f370cef7cef2d62cdf1edc

diff --git a/plugins/textshape/TextTool.cpp b/plugins/textshape/TextTool.cpp
index 7502b8d..4bed236 100644
--- a/plugins/textshape/TextTool.cpp
+++ b/plugins/textshape/TextTool.cpp
@@ -125,27 +125,28 @@ static bool hit(const QKeySequence &input, KStandardShortcut::StandardShortcut s
 }
 
 TextTool::TextTool(KoCanvasBase *canvas)
-        : KoToolBase(canvas),
-        m_textShape(0),
-        m_textShapeData(0),
-        m_changeTracker(0),
-        m_allowActions(true),
-        m_allowAddUndoCommand(true),
-        m_allowResourceManagerUpdates(true),
-        m_prevCursorPosition(-1),
-        m_caretTimer(this),
-        m_caretTimerState(true),
-        m_currentCommand(0),
-        m_currentCommandHasChildren(false),
-        m_specialCharacterDocker(0),
-        m_textTyping(false),
-        m_textDeleting(false)
-        , m_editTipTimer(this),
-        m_delayedEnsureVisible(false),
-        m_toolSelection(0)
+        : KoToolBase(canvas)
+        , m_textShape(0)
+        , m_textShapeData(0)
+        , m_changeTracker(0)
+        , m_allowActions(true)
+        , m_allowAddUndoCommand(true)
+        , m_allowResourceManagerUpdates(true)
+        , m_prevCursorPosition(-1)
+        , m_caretTimer(this)
+        , m_caretTimerState(true)
+        , m_currentCommand(0)
+        , m_currentCommandHasChildren(false)
+        , m_specialCharacterDocker(0)
+        , m_textTyping(false)
+        , m_textDeleting(false)
+        , m_editTipTimer(this)
+        , m_delayedEnsureVisible(false)
+        , m_toolSelection(0)
         , m_tableDraggedOnce(false)
         , m_tablePenMode(false)
-        ,m_lastImMicroFocus(QRectF(0,0,0,0))
+        , m_lastImMicroFocus(QRectF(0,0,0,0))
+        , m_drag(0)
 {
     setTextMode(true);
 
[prev in list] [next in list] [prev in thread] [next in thread]