aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Kharlamov2019-04-02 03:23:27 +0300
committerEli Zaretskii2019-04-05 10:01:58 +0300
commit3187efe713938ad41b676de9dbd92f986d46aa05 (patch)
tree94c8acc02116587ed7cb623f637236d85ee6917d
parent9da8f22de09c73e9557161fd7bb189138ce1fe2f (diff)
downloademacs-3187efe713938ad41b676de9dbd92f986d46aa05.tar.gz
emacs-3187efe713938ad41b676de9dbd92f986d46aa05.zip
Minor cleanup in gtkutil.c
* src/gtkutil.c (x_wm_set_size_hint): Remove variables that are always zero, and simplify all expressions which used them. (Bug#35062)
-rw-r--r--src/gtkutil.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 4bd73b1a6d1..b130692c87a 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1401,7 +1401,6 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position)
1401 GdkGeometry size_hints; 1401 GdkGeometry size_hints;
1402 gint hint_flags = 0; 1402 gint hint_flags = 0;
1403 int base_width, base_height; 1403 int base_width, base_height;
1404 int min_rows = 0, min_cols = 0;
1405 int win_gravity = f->win_gravity; 1404 int win_gravity = f->win_gravity;
1406 Lisp_Object fs_state, frame; 1405 Lisp_Object fs_state, frame;
1407 int scale = xg_get_scale (f); 1406 int scale = xg_get_scale (f);
@@ -1450,13 +1449,10 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position)
1450 base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1) 1449 base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1)
1451 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); 1450 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
1452 1451
1453 if (min_cols > 0) --min_cols; /* We used one col in base_width = ... 1); */
1454 if (min_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */
1455
1456 size_hints.base_width = base_width; 1452 size_hints.base_width = base_width;
1457 size_hints.base_height = base_height; 1453 size_hints.base_height = base_height;
1458 size_hints.min_width = base_width + min_cols * FRAME_COLUMN_WIDTH (f); 1454 size_hints.min_width = base_width;
1459 size_hints.min_height = base_height + min_rows * FRAME_LINE_HEIGHT (f); 1455 size_hints.min_height = base_height;
1460 1456
1461 /* These currently have a one to one mapping with the X values, but I 1457 /* These currently have a one to one mapping with the X values, but I
1462 don't think we should rely on that. */ 1458 don't think we should rely on that. */