Commit: patch 9.2.0966: GTK4: window opens two lines too small

patch 9.2.0966: GTK4: window opens two lines too small

Commit: https://github.com/vim/vim/commit/795ee041f14e547e83a64deb346d1630a35284b7
Author: Hirohito Higashi <[email protected]>
Date:   Mon Aug 17 20:55:16 2026 +0000

    patch 9.2.0966: GTK4: window opens two lines too small
    
    Problem:  On startup the GUI window is the height of the window decorations
              too small, so it shows two lines less than 'lines'.  It only gets
              the right size after the first pointer event.
    Solution: Also request the shell size on the form widget, so that GTK derives
              the window height from it with the decorations included.  Drop the
              request again once the size was given, so that the window can still
              be made smaller (Hirohito Higashi).
    
    closes: #21045
    
    Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
    Signed-off-by: Hirohito Higashi <[email protected]>
    Signed-off-by: Foxe Chen <[email protected]>
    Signed-off-by: Christian Brabandt <[email protected]>

diff --git a/src/gui_gtk4.c b/src/gui_gtk4.c
index 90e3e8603..a876264b4 100644
--- a/src/gui_gtk4.c
+++ b/src/gui_gtk4.c
@@ -256,6 +256,7 @@ static void mainwin_destroy_cb(GObject *object, gpointer data);
 static gboolean delete_event_cb(GtkWindow *window, gpointer data);
 static int query_pointer_pos(int *x, int *y, GdkModifierType *state);
 static void mainwin_fullscreened_cb(GObject *obj, GParamSpec *pspec, gpointer user_data);
+static void set_form_size(int width, int height);
 static void drawarea_realize_cb(GtkWidget *widget, gpointer data);
 static void drawarea_unrealize_cb(GtkWidget *widget, gpointer data);
 #if defined(FEAT_IMAGE)
@@ -770,11 +771,6 @@ gui_mch_open(void)
     pixel_width  += get_menu_tool_width();
     pixel_height += get_menu_tool_height();
 
-    // Dimensions may be smaller because of client side decorations, we handle
-    // that after we present the window.
-    gtk_window_set_default_size(GTK_WINDOW(gui.mainwin),
-	    pixel_width, pixel_height);
-
     if (foreground_argument != NULL)
 	fg_pixel = gui_get_color((char_u *)foreground_argument);
     if (fg_pixel == INVALCOLOR)
@@ -804,15 +800,16 @@ gui_mch_open(void)
 		     G_CALLBACK(mainwin_destroy_cb), NULL);
     // Resize is handled by GtkForm's size_allocate callback.
 
+    set_form_size((int)pixel_width - get_menu_tool_width(),
+	    (int)pixel_height - get_menu_tool_height());
+
     gtk_window_present(GTK_WINDOW(gui.mainwin));
 
-    // Update so that we get the "gui.decor_height", which we can then use to
-    // set the exact dimensions of the window.
+    // Undo the 80x24 clamp above, gui_init() asks for this size next.  Drain
+    // the pending allocation before that, or gui_resize_shell() overwrites it.
     gui_mch_update();
     Columns = columns;
     Rows = rows;
-    gtk_window_set_default_size(GTK_WINDOW(gui.mainwin),
-	    pixel_width, pixel_height + gui.decor_height);
 
     // Make sure the drawing area gets keyboard focus.
     gtk_widget_grab_focus(gui.drawarea);
@@ -953,12 +950,19 @@ gui_gtk_init_decor_height(void)
     gui.decor_height = h;
 }
 
-    void
-gui_mch_set_shellsize(int width, int height,
-	int min_width UNUSED, int min_height UNUSED,
-	int base_width UNUSED, int base_height UNUSED,
-	int direction UNUSED)
+/*
+ * Ask for the form widget, and thus the shell, to become "width" by "height"
+ * pixels.
+ */
+    static void
+set_form_size(int width, int height)
 {
+    // Nothing to do when the form widget already has this size: no allocation
+    // would follow and the size request below would never be dropped.
+    if (gtk_widget_get_width(gui.formwin) == width
+	    && gtk_widget_get_height(gui.formwin) == height)
+	return;
+
     // Remember the size the form widget is supposed to get. An allocation
     // that arrives before the compositor has answered this request still has
     // the previous size and must not be used.
@@ -966,14 +970,26 @@ gui_mch_set_shellsize(int width, int height,
     gui.pending_form_h = height;
     gui.pending_form_skip = 1;
 
-    width += get_menu_tool_width();
-    height += get_menu_tool_height();
-
     // GtkWindow default size also includes client side decorations, so must
-    // include it also.
-    height += gui.decor_height;
+    // include it also.  It also keeps the natural width of the toolbar from
+    // deciding the width.
+    gtk_window_set_default_size(GTK_WINDOW(gui.mainwin),
+	    width + get_menu_tool_width(),
+	    height + get_menu_tool_height() + gui.decor_height);
+
+    // The window drops a request made while it is being presented, and
+    // "gui.decor_height" is not known before that.  A size request on the form
+    // widget is honoured then; it is dropped again once the size was given.
+    gtk_widget_set_size_request(gui.formwin, width, height);
+}
 
-    gtk_window_set_default_size(GTK_WINDOW(gui.mainwin), width, height);
+    void
+gui_mch_set_shellsize(int width, int height,
+	int min_width UNUSED, int min_height UNUSED,
+	int base_width UNUSED, int base_height UNUSED,
+	int direction UNUSED)
+{
+    set_form_size(width, height);
 
     gui_mch_update();
 }
diff --git a/src/gui_gtk4_f.c b/src/gui_gtk4_f.c
index e61092c66..f05665779 100644
--- a/src/gui_gtk4_f.c
+++ b/src/gui_gtk4_f.c
@@ -228,7 +228,21 @@ vim_form_resize_idle_cb(VimForm *self)
 		&& --gui.pending_form_skip >= 0)
 	    goto exit;
 
+	int	req_w, req_h;
+
 	gui.pending_form_w = 0;
+
+	// The size request that Vim made has been answered.  Keep the size and
+	// drop the request, otherwise the window could not be made smaller.
+	gtk_widget_get_size_request(GTK_WIDGET(self), &req_w, &req_h);
+	if (req_w != -1 || req_h != -1)
+	{
+	    gtk_window_set_default_size(GTK_WINDOW(gui.mainwin),
+		    gtk_widget_get_width(gui.mainwin),
+		    gtk_widget_get_height(gui.mainwin));
+	    gtk_widget_set_size_request(GTK_WIDGET(self), -1, -1);
+	}
+
 	gui_resize_shell(self->last_width, self->last_height);
     }
 
diff --git a/src/version.c b/src/version.c
index ae56e26a8..c387ee67a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    966,
 /**/
     965,
 /**/

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1ww4RC-00949r-78%40256bit.org.