The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit 86d8e5cfc553b0de8ecec2a158ac9361a0c20e43
Author: Vincent van Ravesteijn <[email protected]>
Date:   Wed May 9 21:46:37 2012 +0200

    Fix bug #8152: Uneditable long rows for 'Right addresses'
    
    As long as leftMargin() is not correctly implemented for
    MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here. Otherwise, long
    rows will be painted off the screen and will not be editable.
    (cherry picked from commit 92ac678715b07ff7c7adc4b32674382b5e224a44)

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index d9800e3..e764da5 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -793,8 +793,13 @@ pos_type TextMetrics::rowBreakPoint(int width, pit_type 
const pit,
 
        Layout const & layout = par.layout();
 
+#if 0
+       //FIXME: As long as leftMargin() is not correctly implemented for 
+       // MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here.
+       // Otherwise, long rows will be painted off the screen.
        if (layout.margintype == MARGIN_RIGHT_ADDRESS_BOX)
                return addressBreakPoint(pos, par);
+#endif
 
        pos_type const body_pos = par.beginOfBody();
 

-----------------------------------------------------------------------

Summary of changes:
 src/TextMetrics.cpp |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to