ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Gtk: Avoid saving the size while fullscreening occurs.

This commit is contained in:
BearOso 2024-09-11 14:45:07 -05:00
parent 5449e2d3c5
commit ebd9df46ec
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/src/gtk_s9xwindow.cpp
View File

@ -543,12 +543,6 @@ bool Snes9xWindow::draw(const Cairo::RefPtr<Cairo::Context> &cr)
S9xDisplayRefresh(); S9xDisplayRefresh();
if (!(config->fullscreen))
{
config->window_width = get_width();
config->window_height = get_height();
}
if ((is_paused() || NetPlay.Paused) && (gui_config->splash_image < SPLASH_IMAGE_STARFIELD || gui_config->rom_loaded)) if ((is_paused() || NetPlay.Paused) && (gui_config->splash_image < SPLASH_IMAGE_STARFIELD || gui_config->rom_loaded))
{ {
S9xDeinitUpdate(last_width, last_height); S9xDeinitUpdate(last_width, last_height);
@ -1159,12 +1153,7 @@ void Snes9xWindow::enter_fullscreen_mode()
GdkWindow *gdk_window = window->get_window()->gobj(); GdkWindow *gdk_window = window->get_window()->gobj();
config->rom_loaded = 0; config->rom_loaded = 0;
config->fullscreen = 1;
nfs_width = config->window_width;
nfs_height = config->window_height;
int nfs_x;
int nfs_y;
window->get_position(nfs_x, nfs_y);
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
if (config->change_display_resolution && GDK_IS_X11_WINDOW(gdk_window)) if (config->change_display_resolution && GDK_IS_X11_WINDOW(gdk_window))
@ -1232,10 +1221,8 @@ void Snes9xWindow::enter_fullscreen_mode()
1); 1);
} }
#endif #endif
config->fullscreen = 1;
config->rom_loaded = rom_loaded; config->rom_loaded = rom_loaded;
/* If we're running a game, disable ui when entering fullscreen */ /* If we're running a game, disable ui when entering fullscreen */
if (!Settings.Paused && config->rom_loaded) if (!Settings.Paused && config->rom_loaded)
config->ui_visible = false; config->ui_visible = false;
@ -1313,9 +1300,6 @@ void Snes9xWindow::leave_fullscreen_mode()
} }
#endif #endif
resize(nfs_width, nfs_height);
window->move(nfs_x, nfs_y);
config->rom_loaded = rom_loaded; config->rom_loaded = rom_loaded;
config->fullscreen = 0; config->fullscreen = 0;
configure_widgets(); configure_widgets();

1
gtk/src/gtk_s9xwindow.h
View File

@ -88,7 +88,6 @@ class Snes9xWindow : public GtkBuilderWindow
int last_width, last_height; int last_width, last_height;
int mouse_region_x, mouse_region_y; int mouse_region_x, mouse_region_y;
int mouse_region_width, mouse_region_height; int mouse_region_width, mouse_region_height;
int nfs_width, nfs_height, nfs_x, nfs_y;
int autovrr_saved_frameskip; int autovrr_saved_frameskip;
int autovrr_saved_sound_input_rate; int autovrr_saved_sound_input_rate;
bool autovrr_saved_sync_to_vblank; bool autovrr_saved_sync_to_vblank;