patch 9.0.1461: ruler not drawn correctly when using 'rulerformat'
Problem: Ruler not drawn correctly when using 'rulerformat'.
Solution: Adjust formatting depending on whether the ruler is drawn in the
statusline or the command line. (Sean Dewar, closes #12246)
diff --git a/src/screen.c b/src/screen.c
index 6d48ad7..cbf2ab3 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1043,7 +1043,8 @@
{
row = statusline_row(wp);
fillchar = fillchar_status(&attr, wp);
- maxwidth = wp->w_width;
+ int in_status_line = wp->w_status_height != 0;
+ maxwidth = in_status_line ? wp->w_width : Columns;
if (draw_ruler)
{
@@ -1060,11 +1061,11 @@
if (*stl++ != '(')
stl = p_ruf;
}
- col = ru_col - (Columns - wp->w_width);
- if (col < (wp->w_width + 1) / 2)
- col = (wp->w_width + 1) / 2;
- maxwidth = wp->w_width - col;
- if (!wp->w_status_height)
+ col = ru_col - (Columns - maxwidth);
+ if (col < (maxwidth + 1) / 2)
+ col = (maxwidth + 1) / 2;
+ maxwidth -= col;
+ if (!in_status_line)
{
row = Rows - 1;
--maxwidth; // writing in last column may cause scrolling
@@ -1084,7 +1085,8 @@
stl = p_stl;
}
- col += wp->w_wincol;
+ if (in_status_line)
+ col += wp->w_wincol;
}
if (maxwidth <= 0)