diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-14 08:30:51 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-14 08:30:51 +0800 |
| commit | 4d4a96b2061a463fced1add3b52beb3398c39810 (patch) | |
| tree | 38fe0a69a8aba2717e4a93b4796900e11530ccb0 /src/dispnew.c | |
| parent | 67db3bfdc27a5db27ffbe346387f604cf21182b7 (diff) | |
| parent | a7dcc0d55c641d3a16ed64528e726fb297726cbf (diff) | |
| download | emacs-4d4a96b2061a463fced1add3b52beb3398c39810.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 1f214e1c9ee..54948af975b 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -2218,10 +2218,16 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f) w->pixel_left = 0; w->left_col = 0; - w->pixel_top = FRAME_MENU_BAR_HEIGHT (f) - + (!NILP (Vtab_bar_position) ? FRAME_TOOL_BAR_HEIGHT (f) : 0); - w->top_line = FRAME_MENU_BAR_LINES (f) - + (!NILP (Vtab_bar_position) ? FRAME_TOOL_BAR_LINES (f) : 0); + + /* Note that tab and tool bar windows appear above the internal + border, as enforced by WINDOW_TOP_EDGE_Y. */ + + w->pixel_top = (FRAME_MENU_BAR_HEIGHT (f) + + (!NILP (Vtab_bar_position) + ? FRAME_TOOL_BAR_HEIGHT (f) : 0)); + w->top_line = (FRAME_MENU_BAR_LINES (f) + + (!NILP (Vtab_bar_position) + ? FRAME_TOOL_BAR_LINES (f) : 0)); w->total_cols = FRAME_TOTAL_COLS (f); w->pixel_width = (FRAME_PIXEL_WIDTH (f) - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); |