patch 9.1.0358: wrong drawing in GUI with setcellwidth()
Problem: wrong drawing in GUI with setcellwidth()
(after v9.1.0344)
Solution: move gui.in_use condition (h-east)
closes: #14600
Signed-off-by: h-east <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/screen.c b/src/screen.c
index a8b4559..35d3002 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1981,22 +1981,19 @@
{
char_u buf[MB_MAXBYTES + 1];
- if (get_cellwidth(ScreenLinesUC[off]) > 1)
+ if (
+#ifdef FEAT_GUI
+ !gui.in_use &&
+#endif
+ get_cellwidth(ScreenLinesUC[off]) > 1
+ )
{
- // If the width is set to 2 with `setcellwidths`
-
-#ifdef FEAT_GUI
- if (!gui.in_use)
- {
-#endif
- // Clear the two screen cells. If the character is actually
- // single width it won't change the second cell.
- out_str((char_u *)" ");
- term_windgoto(row, col);
- screen_cur_col = 9999;
-#ifdef FEAT_GUI
- }
-#endif
+ // If the width is set to 2 with setcellwidths()
+ // clear the two screen cells. If the character is actually
+ // single width it won't change the second cell.
+ out_str((char_u *)" ");
+ term_windgoto(row, col);
+ screen_cur_col = 9999;
}
else if (utf_ambiguous_width(ScreenLinesUC[off]))
{