Place the depth bar correctly in full screen mode

In full screen mode, it is possible to restrict the text width. In
this case, the paint bar should not be painted outside of this
restricted area.

Fixes bug #11286.

(cherry picked from commit 7485225cc6f26c9e03d3674f4f361b431074fa6e)

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index f27eae6664fbba4b77b0bdab76c126fdcff49e5b..3f367ce4d1237d82c5c8b2662494e058232cf8a2 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -312,9 +312,9 @@ void RowPainter::paintDepthBar() const
        for (depth_type i = 1; i <= depth; ++i) {
                int const w = nestMargin() / 5;
                int x = int(xo_) + w * i;
-               // only consider the changebar space if we're drawing outermost text
+               // consider the bufferview left margin if we're drawing outermost text
                if (text_.isMainText())
-                       x += changebarMargin();
+                       x += pi_.base.bv->leftMargin();
 
                int const starty = yo_ - row_.ascent();
                int const h =  row_.height() - 1 - (i - next_depth - 1) * 3;

diff --git a/status.23x b/status.23x
index adf8b1395b85647d8dd79920bba1c99cd9194ece..d7afa3592bec82ef6ed591c78f16b05b170ca801 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -169,6 +169,8 @@ What's new
 
 - Fix behavior of (un)setting all tabular borders (bug 11382).
 
+- Place the indentation bars correctly in full-screen mode (bug 11286).
+
 
 * INTERNALS