Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify the fullscreen adjustment in xg_frame_set_char_size

Browse source 
* 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).
This commit is contained in:
Dmitry Gutov 2026-05-01 03:58:17 +03:00
parent 049a94b4e5
commit 73fe7a7097
1 changed files with 12 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/gtkutil.c
View file

@ -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);