Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
b4444c8a
Commit
b4444c8a
authored
Aug 30, 2012
by
Jan Djärv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* gtkutil.c (x_wm_set_size_hint): Use 1 col for base_width so it
does not become zero. Fixes: debbugs:12234
parent
b98521db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
src/ChangeLog
src/ChangeLog
+5
-0
src/gtkutil.c
src/gtkutil.c
+3
-2
No files found.
src/ChangeLog
View file @
b4444c8a
2012-08-30 Jan Djärv <jan.h.d@swipnet.se>
* 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 <eggert@cs.ucla.edu>
* dispnew.c (update_frame_1): Pacify gcc -Wstrict-overflow
...
...
src/gtkutil.c
View file @
b4444c8a
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment