From 73fe7a7097da69897c04f8000a60a4f24cd6e468 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Fri, 1 May 2026 03:58:17 +0300
Subject: [PATCH] Simplify the fullscreen adjustment in xg_frame_set_char_size

* src/gtkutil.c (xg_frame_set_char_size): Simplify.  Use the
fullscreen value check to alter the values of outer_width and
outer_height rather than have several larger branches (bug#80662).
---
 src/gtkutil.c | 57 +++++++++++----------------------------------------
 1 file changed, 12 insertions(+), 45 deletions(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 73e93c38906..00ec0a5b728 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1218,56 +1218,23 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
      remain unchanged but giving the frame back its normal size will
      be broken ... */
   if (EQ (fullscreen, Qfullwidth) && width == FRAME_PIXEL_WIDTH (f))
-#ifndef HAVE_PGTK
-    gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-		       gwidth, outer_height);
-#else
-    if (FRAME_GTK_OUTER_WIDGET (f))
-      {
-	gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-			   gwidth, outer_height);
-      }
-    else
-      {
-	gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
-				     gwidth, outer_height);
-      }
-#endif
+    outer_width = gwidth;
   else if (EQ (fullscreen, Qfullheight) && height == FRAME_PIXEL_HEIGHT (f))
-#ifndef HAVE_PGTK
-    gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-		       outer_width, gheight);
-#else
-    if (FRAME_GTK_OUTER_WIDGET (f))
-      {
-	gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-			   outer_width, gheight);
-      }
-    else
-      {
-	gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
-				     outer_width, gheight);
-      }
-#endif
+    outer_height = gheight;
   else
-    {
+    fullscreen = Qnil;
+
 #ifndef HAVE_PGTK
-      gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-			 outer_width, outer_height);
+  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+		     outer_width, outer_height);
 #else
-      if (FRAME_GTK_OUTER_WIDGET (f))
-	{
-	  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-			     outer_width, outer_height);
-	}
-      else
-	{
-	  gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
-				       outer_width, outer_height);
-	}
+  if (FRAME_GTK_OUTER_WIDGET (f))
+    gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+		       outer_width, outer_height);
+  else
+    gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
+				 outer_width, outer_height);
 #endif
-      fullscreen = Qnil;
-    }
 
   SET_FRAME_GARBAGED (f);
   cancel_mouse_face (f);