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>
This commit is contained in:
committed by
Christian Brabandt
parent
564166f681
commit
8927c9b720
17
src/screen.c
17
src/screen.c
@ -1981,22 +1981,19 @@ screen_char(unsigned off, int row, int col)
|
|||||||
{
|
{
|
||||||
char_u buf[MB_MAXBYTES + 1];
|
char_u buf[MB_MAXBYTES + 1];
|
||||||
|
|
||||||
if (get_cellwidth(ScreenLinesUC[off]) > 1)
|
if (
|
||||||
{
|
|
||||||
// If the width is set to 2 with `setcellwidths`
|
|
||||||
|
|
||||||
#ifdef FEAT_GUI
|
#ifdef FEAT_GUI
|
||||||
if (!gui.in_use)
|
!gui.in_use &&
|
||||||
{
|
|
||||||
#endif
|
#endif
|
||||||
// Clear the two screen cells. If the character is actually
|
get_cellwidth(ScreenLinesUC[off]) > 1
|
||||||
|
)
|
||||||
|
{
|
||||||
|
// 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.
|
// single width it won't change the second cell.
|
||||||
out_str((char_u *)" ");
|
out_str((char_u *)" ");
|
||||||
term_windgoto(row, col);
|
term_windgoto(row, col);
|
||||||
screen_cur_col = 9999;
|
screen_cur_col = 9999;
|
||||||
#ifdef FEAT_GUI
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else if (utf_ambiguous_width(ScreenLinesUC[off]))
|
else if (utf_ambiguous_width(ScreenLinesUC[off]))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
358,
|
||||||
/**/
|
/**/
|
||||||
357,
|
357,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user