aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2026-01-05 10:24:45 +0100
committerMartin Rudalics2026-01-05 10:24:45 +0100
commit80360ec4a72ee107c480217587718f05db8865bb (patch)
tree471b0ce1b7274b55e2bb60b6e5e27bbb8b8c20ed /src
parent68418691267ad7cdbb2c5f0462a4f906e112f861 (diff)
downloademacs-80360ec4a72ee107c480217587718f05db8865bb.tar.gz
emacs-80360ec4a72ee107c480217587718f05db8865bb.zip
Fix calculation of outer frame height in NS builds (Bug#80077)
* src/nsfns.m (frame_geometry): Include tool bar height when calculating a frame's outer height (Bug#80077).
Diffstat (limited to 'src')
-rw-r--r--src/nsfns.m5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nsfns.m b/src/nsfns.m
index 8890a05e68f..4bd488478a8 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -3479,16 +3479,17 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute)
3479 || EQ (fullscreen_symbol, Qfullscreen)); 3479 || EQ (fullscreen_symbol, Qfullscreen));
3480 int border = fullscreen ? 0 : f->border_width; 3480 int border = fullscreen ? 0 : f->border_width;
3481 int title_height = fullscreen ? 0 : FRAME_NS_TITLEBAR_HEIGHT (f); 3481 int title_height = fullscreen ? 0 : FRAME_NS_TITLEBAR_HEIGHT (f);
3482 int tool_bar_height = FRAME_TOOLBAR_HEIGHT (f);
3482 int native_width = FRAME_PIXEL_WIDTH (f); 3483 int native_width = FRAME_PIXEL_WIDTH (f);
3483 int native_height = FRAME_PIXEL_HEIGHT (f); 3484 int native_height = FRAME_PIXEL_HEIGHT (f);
3484 int outer_width = native_width + 2 * border; 3485 int outer_width = native_width + 2 * border;
3485 int outer_height = native_height + 2 * border + title_height; 3486 int outer_height
3487 = native_height + 2 * border + title_height + tool_bar_height;
3486 int native_left = f->left_pos + border; 3488 int native_left = f->left_pos + border;
3487 int native_top = f->top_pos + border + title_height; 3489 int native_top = f->top_pos + border + title_height;
3488 int native_right = f->left_pos + outer_width - border; 3490 int native_right = f->left_pos + outer_width - border;
3489 int native_bottom = f->top_pos + outer_height - border; 3491 int native_bottom = f->top_pos + outer_height - border;
3490 int internal_border_width = FRAME_INTERNAL_BORDER_WIDTH (f); 3492 int internal_border_width = FRAME_INTERNAL_BORDER_WIDTH (f);
3491 int tool_bar_height = FRAME_TOOLBAR_HEIGHT (f);
3492 int tool_bar_width = (tool_bar_height 3493 int tool_bar_width = (tool_bar_height
3493 ? outer_width - 2 * internal_border_width 3494 ? outer_width - 2 * internal_border_width
3494 : 0); 3495 : 0);