diff options
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 8a2fc3aa16d..16d765533a7 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -951,8 +951,8 @@ xg_frame_set_char_size (struct frame *f, int width, int height) | |||
| 951 | Lisp_Object fullscreen = get_frame_param (f, Qfullscreen); | 951 | Lisp_Object fullscreen = get_frame_param (f, Qfullscreen); |
| 952 | gint gwidth, gheight; | 952 | gint gwidth, gheight; |
| 953 | int totalheight | 953 | int totalheight |
| 954 | = pixelheight + FRAME_TOOLBAR_HEIGHT (f) + FRAME_TABBAR_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f); | 954 | = pixelheight + FRAME_TOOLBAR_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f); |
| 955 | int totalwidth = pixelwidth + FRAME_TABBAR_WIDTH (f) + FRAME_TOOLBAR_WIDTH (f); | 955 | int totalwidth = pixelwidth + FRAME_TOOLBAR_WIDTH (f); |
| 956 | 956 | ||
| 957 | if (FRAME_PIXEL_HEIGHT (f) == 0) | 957 | if (FRAME_PIXEL_HEIGHT (f) == 0) |
| 958 | return; | 958 | return; |
| @@ -1437,9 +1437,9 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position) | |||
| 1437 | /* Use one row/col here so base_height/width does not become zero. | 1437 | /* Use one row/col here so base_height/width does not become zero. |
| 1438 | Gtk+ and/or Unity on Ubuntu 12.04 can't handle it. | 1438 | Gtk+ and/or Unity on Ubuntu 12.04 can't handle it. |
| 1439 | Obviously this makes the row/col value displayed off by 1. */ | 1439 | Obviously this makes the row/col value displayed off by 1. */ |
| 1440 | base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 1) + FRAME_TABBAR_WIDTH (f) + FRAME_TOOLBAR_WIDTH (f); | 1440 | base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 1) + FRAME_TOOLBAR_WIDTH (f); |
| 1441 | base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1) | 1441 | base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1) |
| 1442 | + FRAME_MENUBAR_HEIGHT (f) + FRAME_TABBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); | 1442 | + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); |
| 1443 | 1443 | ||
| 1444 | size_hints.base_width = base_width; | 1444 | size_hints.base_width = base_width; |
| 1445 | size_hints.base_height = base_height; | 1445 | size_hints.base_height = base_height; |