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

Fixed gtk window gui resizing logic. Can now resize by dragging the corners of the window with the mouse as well as through the vidio menu.

This commit is contained in:
Matthew Budd 2020-05-10 23:38:36 -04:00
parent d6a798962c
commit dfd236c9d1
4 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -44,7 +44,7 @@ if platform.system == "ppc":
env['LSB_FIRST'] = 0 env['LSB_FIRST'] = 0
# Default compiler flags: # Default compiler flags:
env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare']) env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare', '-Wno-parentheses', '-Wno-unused-local-typedefs'])
env.Append(CXXFLAGS = ['-std=c++0x']) env.Append(CXXFLAGS = ['-std=c++0x'])
if 'PLATFORM' in os.environ: if 'PLATFORM' in os.environ:

2
src/cart.h
View File

@ -104,4 +104,4 @@ bool FCEU_OpenGenie(void);
void FCEU_CloseGenie(void); void FCEU_CloseGenie(void);
void FCEU_KillGenie(void); void FCEU_KillGenie(void);
#endif#endif #endif

38
src/drivers/sdl/gui.cpp
View File

@ -43,6 +43,10 @@
#define gtk_combo_box_text_append_text gtk_combo_box_append_text #define gtk_combo_box_text_append_text gtk_combo_box_append_text
#endif #endif
// NES resolution = 256x240
const int NES_WIDTH=256;
const int NES_HEIGHT=240;
void toggleSound(GtkWidget* check, gpointer data); void toggleSound(GtkWidget* check, gpointer data);
void loadGame (void); void loadGame (void);
void closeGame(void); void closeGame(void);
@ -297,8 +301,9 @@ int configGamepadButton(GtkButton* button, gpointer p)
return 0; return 0;
} }
void resetVideo() void resetVideo(void)
{ {
resizeGtkWindow();
KillVideo(); KillVideo();
InitVideo(GameInfo); InitVideo(GameInfo);
} }
@ -945,18 +950,20 @@ void setQuality(GtkWidget* w, gpointer p)
return; return;
} }
void resizeGtkWindow() void resizeGtkWindow(void)
{ {
if(GameInfo == 0) //if(GameInfo == 0)
{ //{
double xscale, yscale; double xscale, yscale;
g_config->getOption("SDL.XScale", &xscale); g_config->getOption("SDL.XScale", &xscale);
g_config->getOption("SDL.YScale", &yscale); g_config->getOption("SDL.YScale", &yscale);
gtk_widget_set_size_request(evbox, 256*xscale, 224*yscale); gtk_widget_set_size_request(evbox, NES_WIDTH*xscale, NES_HEIGHT*yscale);
GtkRequisition req; GtkRequisition req;
gtk_widget_get_preferred_size(GTK_WIDGET(MainWindow), NULL, &req); gtk_widget_get_preferred_size(GTK_WIDGET(MainWindow), NULL, &req);
//printf("GTK Resizing: w:%i h:%i \n", req.width, req.height );
gtk_window_resize(GTK_WINDOW(MainWindow), req.width, req.height); gtk_window_resize(GTK_WINDOW(MainWindow), req.width, req.height);
} gtk_widget_set_size_request(evbox, NES_WIDTH, NES_HEIGHT);
//}
return; return;
} }
@ -4749,11 +4756,8 @@ gint handleMouseClick(GtkWidget* widget, GdkEvent *event, gpointer callback_data
return 0; return 0;
} }
// NES resolution = 256x240
const int NES_WIDTH=256;
const int NES_HEIGHT=240;
void handle_resize(GtkWindow* win, GdkEvent* event, gpointer data) gboolean handle_resize(GtkWindow* win, GdkEvent* event, gpointer data)
{ {
// TODO this is a stub atm // TODO this is a stub atm
// this should handle resizing so the emulation takes up as much // this should handle resizing so the emulation takes up as much
@ -4764,7 +4768,7 @@ void handle_resize(GtkWindow* win, GdkEvent* event, gpointer data)
int width, height; int width, height;
width = event->configure.width; width = event->configure.width;
height = event->configure.height; height = event->configure.height;
printf("DEBUG: new window size: %dx%d\n", width, height); printf("DEBUG: Configure new window size: %dx%d\n", width, height);
// get width/height multipliers // get width/height multipliers
double xscale = width / (double)NES_WIDTH; double xscale = width / (double)NES_WIDTH;
@ -4787,7 +4791,7 @@ void handle_resize(GtkWindow* win, GdkEvent* event, gpointer data)
KillVideo(); KillVideo();
InitVideo(GameInfo); InitVideo(GameInfo);
} }
gtk_widget_set_size_request(evbox, (int)(NES_WIDTH*xscale), (int)(NES_HEIGHT*yscale)); //gtk_widget_set_size_request(evbox, (int)(NES_WIDTH*xscale), (int)(NES_HEIGHT*yscale));
// Currently unused; unsure why // Currently unused; unsure why
/* GdkColor black; /* GdkColor black;
@ -4798,7 +4802,7 @@ void handle_resize(GtkWindow* win, GdkEvent* event, gpointer data)
printf("DEBUG: new xscale: %f yscale: %f\n", xscale, yscale); printf("DEBUG: new xscale: %f yscale: %f\n", xscale, yscale);
return; return FALSE;
} }
int InitGTKSubsystem(int argc, char** argv) int InitGTKSubsystem(int argc, char** argv)
@ -4864,13 +4868,17 @@ int InitGTKSubsystem(int argc, char** argv)
g_signal_connect(MainWindow, "delete-event", quit, NULL); g_signal_connect(MainWindow, "delete-event", quit, NULL);
g_signal_connect(MainWindow, "destroy-event", quit, NULL); g_signal_connect(MainWindow, "destroy-event", quit, NULL);
// resize handler // resize handler
// g_signal_connect(MainWindow, "configure-event", G_CALLBACK(handle_resize), NULL); g_signal_connect(MainWindow, "configure-event", G_CALLBACK(handle_resize), NULL);
gtk_widget_show_all(MainWindow); gtk_widget_show_all(MainWindow);
GtkRequisition req; GtkRequisition req;
gtk_widget_get_preferred_size(GTK_WIDGET(MainWindow), NULL, &req); gtk_widget_get_preferred_size(GTK_WIDGET(MainWindow), NULL, &req);
gtk_window_resize(GTK_WINDOW(MainWindow), req.width, req.height); //printf("Init Resize: w:%i h:%i \n", req.width, req.height );
gtk_window_resize(GTK_WINDOW(MainWindow), req.width, req.height );
// Once the window has been resized, return draw area size request to minimum values
gtk_widget_set_size_request(evbox, NES_WIDTH, NES_HEIGHT);
gtkIsStarted = true; gtkIsStarted = true;
return 0; return 0;

17
src/drivers/sdl/sdl-video.cpp
View File

@ -429,14 +429,15 @@ InitVideo(FCEUGI *gi)
return -1; return -1;
} }
#ifdef _GTK // This code is not needed, gui.cpp handles all window sizing.
if(noGui == 0) //#ifdef _GTK
{ // if(noGui == 0)
GtkRequisition req; // {
gtk_widget_get_preferred_size(GTK_WIDGET(MainWindow), NULL, &req); // GtkRequisition req;
gtk_window_resize(GTK_WINDOW(MainWindow), req.width, req.height); // gtk_widget_get_preferred_size(GTK_WIDGET(MainWindow), NULL, &req);
} // gtk_window_resize(GTK_WINDOW(MainWindow), req.width, req.height);
#endif // }
//#endif
} }
s_curbpp = s_screen->format->BitsPerPixel; s_curbpp = s_screen->format->BitsPerPixel;
if(!s_screen) { if(!s_screen) {