From: Jan Djärv Date: Thu, 8 Mar 2012 18:49:13 +0000 (+0100) Subject: * gtkutil.c (x_wm_set_size_hint): Use one row in call to X-Git-Tag: emacs-pretest-24.0.05~136 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/89c94350a4e24074150e62f7d443c9b6902ed13b?hp=6ff6e72f7993e06f831428e0ad8ccc0c5bf2524a * gtkutil.c (x_wm_set_size_hint): Use one row in call to FRAME_TEXT_LINES_TO_PIXEL_HEIGHT so base_height is greater than zero. Fixes: debbugs:10954 --- diff --git a/src/ChangeLog b/src/ChangeLog index ef57223b9c..f623e9d46e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-03-08 Jan Djärv + + * gtkutil.c (x_wm_set_size_hint): Use one row in call to + FRAME_TEXT_LINES_TO_PIXEL_HEIGHT so base_height is greater than + zero (Bug#10954). + 2012-03-03 Glenn Morris * alloc.c (Fgarbage_collect, misc-objects-consed): Doc fixes. diff --git a/src/gtkutil.c b/src/gtkutil.c index 1ed5833bd5..4dbef65ded 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1304,10 +1304,13 @@ x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position) hint_flags |= GDK_HINT_BASE_SIZE; base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0) + FRAME_TOOLBAR_WIDTH (f); - base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0) + /* Use one row here so base_height does not become zero. + Gtk+ and/or Unity on Ubuntu 12.04 can't handle it. */ + base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); check_frame_size (f, &min_rows, &min_cols); + if (min_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */ size_hints.base_width = base_width; size_hints.base_height = base_height;