From b4444c8ad0d86f80263ffdaf7363dc0ad3a4f1fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Thu, 30 Aug 2012 18:07:44 +0200 Subject: [PATCH] * gtkutil.c (x_wm_set_size_hint): Use 1 col for base_width so it does not become zero. Fixes: debbugs:12234 --- src/ChangeLog | 5 +++++ src/gtkutil.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c8f75645585..261fa80d718 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-08-30 Jan Djärv + + * gtkutil.c (x_wm_set_size_hint): Use 1 col for base_width so it + does not become zero (Bug#12234). + 2012-08-30 Paul Eggert * dispnew.c (update_frame_1): Pacify gcc -Wstrict-overflow diff --git a/src/gtkutil.c b/src/gtkutil.c index 2941605d448..939e472d6d2 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1348,13 +1348,14 @@ x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position) size_hints.height_inc = FRAME_LINE_HEIGHT (f); hint_flags |= GDK_HINT_BASE_SIZE; - base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0) + FRAME_TOOLBAR_WIDTH (f); - /* Use one row here so base_height does not become zero. + /* Use one row/col here so base_height/width does not become zero. Gtk+ and/or Unity on Ubuntu 12.04 can't handle it. */ + base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 1) + FRAME_TOOLBAR_WIDTH (f); 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_cols > 0) --min_cols; /* We used one col in base_width = ... 1); */ if (min_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */ size_hints.base_width = base_width; -- 2.39.2