Changeset 27581

Timestamp:

11/16/08 20:54:09 (2 months ago)

Author:

vfr

Message:

branch: Make sure the selection painting is updated after LFUN_UP or LFUN_DOWN. See http://thread.gmane.org/gmane.editors.lyx.devel/113428

Files:

• lyx-devel/branches/BRANCH_1_6_X/src/Cursor.cpp (modified) (2 diffs)
• lyx-devel/branches/BRANCH_1_6_X/src/Cursor.h (modified) (1 diff)
• lyx-devel/branches/BRANCH_1_6_X/src/Text3.cpp (modified) (1 diff)
• lyx-devel/branches/BRANCH_1_6_X/status.16x (modified) (1 diff)

lyx-devel/branches/BRANCH_1_6_X/src/Cursor.cpp

@@ -1703 +1703 @@
-
-
+bool Cursor::atFirstOrLastRow(bool up)
+{
+        TextMetrics const & tm = bv_->textMetrics(text());
+        ParagraphMetrics const & pm = tm.parMetrics(pit());
+        
+        int row;
+        if (pos() && boundary())
+                row = pm.pos2row(pos() - 1);
+        else
+                row = pm.pos2row(pos());
+        
+        if (up) {
+                if (pit() == 0 && row == 0)
+                        return true;
+        } else {
+                if (pit() + 1 >= int(text()->paragraphs().size()) &&
+                                row + 1 >= int(pm.rows().size()))
+                        return true;
+        }
+        return false;
+}
+
-bool Cursor::upDownInText(bool up, bool & updateNeeded)
-{
@@ -1756 +1778 @@
-                row = pm.pos2row(pos());
-                
-
-
-
-
-
-
-
-
-
+
+
-
-        // with and without selection are handled differently

lyx-devel/branches/BRANCH_1_6_X/src/Cursor.h

@@ -360 +360 @@
-        /// return true if fullscreen update is needed
-        bool down();
+        /// whether the cursor is either at the first or last row
+        bool atFirstOrLastRow(bool up);
-        /// move up/down in a text inset, called for LFUN_UP/DOWN,
-        /// return true if successful, updateNeeded set to true if fullscreen

lyx-devel/branches/BRANCH_1_6_X/src/Text3.cpp

@@ -616 +616 @@
-                bool select = cmd.action == LFUN_DOWN_SELECT ||
-                        cmd.action == LFUN_UP_SELECT;
-                cur.selHandle(select);
-
-                // move cursor up/down
-                bool up = cmd.action == LFUN_UP_SELECT || cmd.action == LFUN_UP;
-
-
-
+
+
+
+
+
+
-                        needsUpdate |= cur.beforeDispatchCursor().inMathed();
-
+
+
+
+
+
+
-                        cur.undispatched();
+                }
-
-                break;

lyx-devel/branches/BRANCH_1_6_X/status.16x

@@ -65 +65 @@
-- Fix possible endless loop while running lyx2lyx.
-
+- Fix painting update rules after LFUN_UP or LFUN_DOWN in an inset.
+
-
-* USER INTERFACE