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

List:       kde-commits
Subject:    koffice/plugins/paragraphtool
From:       Florian Merz <florianmerz () gmx ! de>
Date:       2008-10-28 21:15:03
Message-ID: 1225228503.850549.21860.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 877186 by fmerz:

don't allow out-of-range values with the keyboard.

 M  +3 -6      ParagraphEditor.cpp  
 M  +0 -1      ParagraphTool.cpp  
 M  +14 -1     Ruler.cpp  
 M  +2 -6      Ruler.h  


--- trunk/koffice/plugins/paragraphtool/ParagraphEditor.cpp #877185:877186
@@ -136,7 +136,7 @@
     QLineF connector(converter.documentToView(unmapped.p1()), converter.documentToView(unmapped.p2()));
     connector.setLength(10.0);
 
-    QString text(m_rulers[ruler].name() + " " + m_rulers[ruler].valueString());
+    QString text(m_rulers[ruler].name() + ' ' + m_rulers[ruler].valueString());
 
     painter.setBrush(Qt::white);
     painter.setPen(foregroundColor);
@@ -275,11 +275,8 @@
     m_activeRulerFragment = fragment;
     m_rulers[m_activeRuler].setActive(true);
 
-    // disable hovering if we have an active ruler
-    // hovering over the wrong ruler confuses the user
-    if (hasHighlightedRuler()) {
-        dehighlightRuler();
-    }
+    defocusRuler();
+    dehighlightRuler();
 }
 
 void ParagraphEditor::deactivateRuler()
--- trunk/koffice/plugins/paragraphtool/ParagraphTool.cpp #877185:877186
@@ -140,7 +140,6 @@
         switch (event->key()) {
         case Qt::Key_Shift:
             if (!event->isAutoRepeat()) {
-                kDebug() << "pressed";
                 m_paragraphEditor.toggleSmoothMovement();
             }
             break;
--- trunk/koffice/plugins/paragraphtool/Ruler.cpp #877185:877186
@@ -99,7 +99,8 @@
 
     if (value != m_value) {
         m_value = value;
-        emit needsRepaint();
+        emit valueChanged(m_value);
+//        emit needsRepaint();
     }
 }
 
@@ -195,6 +196,18 @@
     return visible;
 }
 
+void Ruler::increaseByStep()
+{
+    qreal newValue = qMin(value() + stepValue(), maximumValue());
+    setValue(newValue);
+}
+
+void Ruler::decreaseByStep()
+{
+    qreal newValue = qMax(value() - stepValue(), minimumValue());
+    setValue(newValue);
+}
+
 RulerFragment *Ruler::hitTest(const QPointF &point)
 {
     if (!m_enabled) {
--- trunk/koffice/plugins/paragraphtool/Ruler.h #877185:877186
@@ -118,12 +118,8 @@
 
     bool isVisible() const;
 
-    void increaseByStep() {
-        setValue(value() + stepValue()); emit valueChanged(value());
-    }
-    void decreaseByStep() {
-        setValue(value() - stepValue()); emit valueChanged(value());
-    }
+    void increaseByStep();
+    void decreaseByStep();
 
     QColor activeColor() const {
         return QColor(100, 148, 255);
[prev in list] [next in list] [prev in thread] [next in thread]