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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkoffice/change-tracking-integration=5D_plugins/text?=
From:       Thomas Zander <zander () kde ! org>
Date:       2011-02-23 12:55:11
Message-ID: 20110223125511.3C0B9A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 39c835a2e7eed7681caceb8c8ac4f57f6c85ad94 by Thomas Zander.
Committed on 23/02/2011 at 12:56.
Pushed by zander into branch 'change-tracking-integration'.

Merge branch 'master' into change-tracking-integration

I  +11   -0    kword/part/dialogs/KWFrameRunaroundProperties.cpp     
I  +4    -4    kword/part/frames/KWFrameLayout.cpp     
I  +3    -1    libs/flake/KoShape.cpp     
I  +12   -2    libs/kotext/KoTextDocumentLayout.cpp     
I  +1    -0    libs/kotext/styles/KoParagraphStyle.cpp     
MM +1    -1    plugins/textshape/Layout.cpp     
MM +6    -3    plugins/textshape/TextTool.cpp     
I  +3    -1    plugins/textshape/dialogs/NewStyleWidget.cpp     
I  +2    -1    plugins/textshape/dialogs/NewStyleWidget.h     
I  +108  -100  plugins/textshape/dialogs/NewStyleWidget.ui     
I  +53   -12   plugins/textshape/dialogs/StyleManager.cpp     
I  +1    -0    plugins/textshape/dialogs/StyleManager.h     
I  +1    -0    plugins/textshape/dialogs/StylesWidget.cpp     

http://commits.kde.org/koffice/39c835a2e7eed7681caceb8c8ac4f57f6c85ad94

diff --cc plugins/textshape/TextTool.cpp
index f819e8b,b1e6a58..a21dd58
--- a/plugins/textshape/TextTool.cpp
+++ b/plugins/textshape/TextTool.cpp
@@@ -859,11 -824,12 +861,12 @@@ int TextTool::pointToPosition(const QPo
          return -1;
      Q_ASSERT(m_textShapeData);
      QPointF p = m_textShape->convertScreenPos(point);
 -    int caretPos = m_textEditor.data()->document()->documentLayout()->hitTest(p, Qt::FuzzyHit);
 +    int caretPos = m_textEditor.data()->document()->documentLayout()->hitTest(p, Qt::ExactHit);
      caretPos = qMax(caretPos, m_textShapeData->position());
      if (m_textShapeData->endPosition() == -1) {
-         kWarning(32500) << "Clicking in not fully laid-out textframe";
-         m_textShapeData->fireResizeEvent(); // requests a layout run ;)
+         //kWarning(32500) << "Clicking in not fully laid-out textframe";
+         //m_textShapeData->fireResizeEvent(); // requests a layout run ;)
+         return -1;
      }
      caretPos = qMin(caretPos, m_textShapeData->endPosition());
      return caretPos;


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