diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2016-07-30 14:11:12 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2016-07-30 14:11:12 +0200 |
| commit | 8cbaf342538fe49f6f064f65717672f8eeb83750 (patch) | |
| tree | 129675a65a48a9d4c9700656b0caa338e472f10f /src/xfns.c | |
| parent | 7d58b02f363ab02961faa950d1ba727df96f2f19 (diff) | |
| download | emacs-8cbaf342538fe49f6f064f65717672f8eeb83750.tar.gz | |
Fix calculation of tool bar width reported by `frame-geometry' (Bug#24107)
* src/w32fns.c (Fw32_frame_geometry): Fix calculation of tool
bar width (Bug#24107). Reindent.
* src/xfns.c (frame_geometry): Fix calculation of tool bar
width on non-GTK builds.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index c44997b3d6f..ccea20eef96 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4626,7 +4626,9 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute) } #else tool_bar_height = FRAME_TOOL_BAR_HEIGHT (f); - tool_bar_width = tool_bar_height ? native_width : 0; + tool_bar_width = (tool_bar_height + ? native_width - 2 * internal_border_width + : 0); inner_top += tool_bar_height; #endif |