diff options
| author | Konstantin Kharlamov <Hi-Angel@yandex.ru> | 2019-04-02 03:23:27 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-04-05 10:01:58 +0300 |
| commit | 3187efe713938ad41b676de9dbd92f986d46aa05 (patch) | |
| tree | 94c8acc02116587ed7cb623f637236d85ee6917d | |
| parent | 9da8f22de09c73e9557161fd7bb189138ce1fe2f (diff) | |
| download | emacs-3187efe713938ad41b676de9dbd92f986d46aa05.tar.gz | |
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.c | 8 |
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) GdkGeometry size_hints; gint hint_flags = 0; int base_width, base_height; - int min_rows = 0, min_cols = 0; int win_gravity = f->win_gravity; Lisp_Object fs_state, frame; int scale = xg_get_scale (f); @@ -1450,13 +1449,10 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position) base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); - 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; size_hints.base_height = base_height; - size_hints.min_width = base_width + min_cols * FRAME_COLUMN_WIDTH (f); - size_hints.min_height = base_height + min_rows * FRAME_LINE_HEIGHT (f); + size_hints.min_width = base_width; + size_hints.min_height = base_height; /* These currently have a one to one mapping with the X values, but I don't think we should rely on that. */ |