(x_wm_set_size_hint): Use x_display_pixel_width and x_display_pixel_height.

3e7600a6 · Eli Zaretskii · 05eb7cdc · 3e7600a6 · 3e7600a6
Commit 3e7600a6 authored Sep 19, 2008 by Eli Zaretskii
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

src/ChangeLog src/ChangeLog +5 -0

src/xterm.c src/xterm.c +4 -4

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2008-09-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* xterm.c (x_wm_set_size_hint): Use x_display_pixel_width and
+	x_display_pixel_height.
+
 2008-09-19  Juanma Barranquero  <lekktu@gmail.com>
  
 	* frame.c (x_fullscreen_adjust): Declare var as Display_Info.

--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9619,10 +9619,10 @@ x_wm_set_size_hint (f, flags, user_position)

  size_hints.width_inc = FRAME_COLUMN_WIDTH (f);
  size_hints.height_inc = FRAME_LINE_HEIGHT (f);
-  size_hints.max_width
-    = FRAME_X_DISPLAY_INFO (f)->width - FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
-  size_hints.max_height
-    = FRAME_X_DISPLAY_INFO (f)->height - FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0);
+  size_hints.max_width = x_display_pixel_width (FRAME_X_DISPLAY_INFO (f))
+    - FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
+  size_hints.max_height = x_display_pixel_height (FRAME_X_DISPLAY_INFO (f))
+    - FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0);

  /* Calculate the base and minimum sizes.