[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3187efe: Minor cleanup in gtkutil.c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 3187efe: Minor cleanup in gtkutil.c |
Date: |
Fri, 5 Apr 2019 03:02:57 -0400 (EDT) |
branch: master
commit 3187efe713938ad41b676de9dbd92f986d46aa05
Author: Konstantin Kharlamov <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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)
---
src/gtkutil.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 4bd73b1..b130692 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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 3187efe: Minor cleanup in gtkutil.c,
Eli Zaretskii <=