procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* gtkutil.c (x_wm_set_size_hint): Use one row in call to

Browse source 
FRAME_TEXT_LINES_TO_PIXEL_HEIGHT so base_height is greater than
zero.

Fixes: debbugs:10954
This commit is contained in:
Jan Djärv 2012-03-08 19:49:13 +01:00
parent 6ff6e72f79
commit 89c94350a4
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2012-03-08 Jan Djärv <jan.h.d@swipnet.se>
* 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 <rgm@gnu.org>
* alloc.c (Fgarbage_collect, misc-objects-consed): Doc fixes.

5
src/gtkutil.c
View file

@ -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;