diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2019-06-26 00:30:33 +0900 |
|---|---|---|
| committer | Jeff Walsh <fejfighter@gmail.com> | 2020-11-22 14:46:55 +1100 |
| commit | 164800da6f673afeba729befbfbfd0e6131eadb8 (patch) | |
| tree | 5d54518af541ca162222056d879c1e190d0b27f9 /src/emacsgtkfixed.c | |
| parent | 330a346ca734d39c0233ef899e044d05e0e1ebe9 (diff) | |
| download | emacs-164800da6f673afeba729befbfbfd0e6131eadb8.tar.gz | |
Add Preferred geometry settings
* ../src/pgtkterm.h (struct pgtk_output):
* ../src/pgtkterm.c (pgtk_set_window_size):
* ../src/gtkutil.c (x_wm_set_size_hint):
* ../src/emacsgtkfixed.c (emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height):
Fixup toolbar handling
toolbar, menubar の ON/OFF でサイズが変化していっていたのを修正。
Diffstat (limited to 'src/emacsgtkfixed.c')
| -rw-r--r-- | src/emacsgtkfixed.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index aeca3d4f7cc..4128f81cce9 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -188,11 +188,13 @@ emacs_fixed_get_preferred_width (GtkWidget *widget, EmacsFixedPrivate *priv = fixed->priv; #ifdef HAVE_PGTK int w = priv->f->output_data.pgtk->size_hints.min_width; + if (minimum) *minimum = w; + if (natural) *natural = priv->f->output_data.pgtk->preferred_width; #else int w = priv->f->output_data.x->size_hints.min_width; -#endif if (minimum) *minimum = w; if (natural) *natural = w; +#endif } static void @@ -204,11 +206,13 @@ emacs_fixed_get_preferred_height (GtkWidget *widget, EmacsFixedPrivate *priv = fixed->priv; #ifdef HAVE_PGTK int h = priv->f->output_data.pgtk->size_hints.min_height; + if (minimum) *minimum = h; + if (natural) *natural = priv->f->output_data.pgtk->preferred_height; #else int h = priv->f->output_data.x->size_hints.min_height; -#endif if (minimum) *minimum = h; if (natural) *natural = h; +#endif } |