patch 9.1.1461: tabpanel: tabpanel vanishes with popup menu
Problem: tabpanel: tabpanel vanishes with popup menu
Solution: remove pum-related test in tabpanel_leftcol(), refactor a few
related functions (Hirohito Higashi)
This commit does the following:
- Delete unnecessary pum-related checks in the tabpanel_leftcol()
function
- remove pum-related check in tabpanel_leftcol()
- The argument of the TPL_LCOL() macro has been deleted.
- The argument of the tabpanel_leftcol() function has been changed
to void
- The return type of the `win_comp_pos()` function has been changed to
void
closes: #17549
Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/window.c b/src/window.c
index 52f4b1a..29bcc43 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1434,7 +1434,7 @@
}
if (flags & (WSP_TOP | WSP_BOT))
- (void)win_comp_pos();
+ win_comp_pos();
// Both windows need redrawing. Update all status lines, in case they
// show something related to the window count or position.
@@ -1855,7 +1855,7 @@
frame_fix_width(curwin);
frame_fix_width(wp);
- (void)win_comp_pos(); // recompute window positions
+ win_comp_pos(); // recompute window positions
if (wp->w_buffer != curbuf)
reset_VIsual_and_resel();
@@ -1943,7 +1943,7 @@
frame_fix_width(wp2);
// recompute w_winrow and w_wincol for all windows
- (void)win_comp_pos();
+ win_comp_pos();
}
redraw_all_later(UPD_NOT_VALID);
@@ -1972,7 +1972,7 @@
winframe_remove(wp, &dir, NULL, &unflat_altfr);
win_remove(wp, NULL);
last_status(FALSE); // may need to remove last status line
- (void)win_comp_pos(); // recompute window positions
+ win_comp_pos(); // recompute window positions
// Split a window on the desired side and put "wp" there.
if (win_split_ins(size, flags, wp, dir, unflat_altfr) == FAIL)
@@ -2064,7 +2064,7 @@
win_append(win2, win1);
frame_append(win2->w_frame, win1->w_frame);
- (void)win_comp_pos(); // recompute w_winrow for all windows
+ win_comp_pos(); // recompute w_winrow for all windows
redraw_later(UPD_NOT_VALID);
}
win_enter(win1, FALSE);
@@ -5812,7 +5812,7 @@
*/
if (!hidden)
win_append(after, new_wp);
- new_wp->w_wincol = TPL_LCOL(NULL);
+ new_wp->w_wincol = TPL_LCOL();
new_wp->w_width = COLUMNS_WITHOUT_TPL();
// position the display and the cursor at the top of the file.
@@ -6177,7 +6177,7 @@
if (!frame_check_height(topframe, h))
frame_new_height(topframe, h, FALSE, FALSE, FALSE);
- (void)win_comp_pos(); // recompute w_winrow and w_wincol
+ win_comp_pos(); // recompute w_winrow and w_wincol
compute_cmdrow();
curtab->tp_ch_used = p_ch;
@@ -6212,7 +6212,7 @@
if (!frame_check_width(topframe, w))
frame_new_width(topframe, w, FALSE, FALSE);
- (void)win_comp_pos(); // recompute w_winrow and w_wincol
+ win_comp_pos(); // recompute w_winrow and w_wincol
if (!skip_win_fix_scroll)
win_fix_scroll(TRUE);
@@ -6277,7 +6277,7 @@
}
}
// recompute the window positions
- (void)win_comp_pos();
+ win_comp_pos();
}
}
@@ -6286,14 +6286,13 @@
* frames.
* Returns the row just after the last window.
*/
- int
+ void
win_comp_pos(void)
{
int row = tabline_height();
- int col = TPL_LCOL(NULL);
+ int col = TPL_LCOL();
frame_comp_pos(topframe, &row, &col);
- return row;
}
/*
@@ -6592,7 +6591,7 @@
frame_setwidth(wp->w_frame, width + wp->w_vsep_width);
// recompute the window positions
- (void)win_comp_pos();
+ win_comp_pos();
redraw_all_later(UPD_NOT_VALID);
}
@@ -7016,7 +7015,7 @@
else
fr = fr->fr_next;
}
- (void)win_comp_pos();
+ win_comp_pos();
redraw_all_later(UPD_NOT_VALID);
}
@@ -7480,7 +7479,7 @@
{
frame_new_height(fp, fp->fr_height - 1, FALSE, FALSE, FALSE);
frame_fix_height(wp);
- (void)win_comp_pos();
+ win_comp_pos();
}
else
win_new_height(wp, wp->w_height - 1);