From 3dcb931a4948efbe01eb26c47bfe408140977597 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Mon, 6 Sep 2010 12:09:49 +0000 Subject: [PATCH] Remove fullscreen from the configuration dialog, and make esc go back to windowed mode. git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3736 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/zzogl-pg/opengl/Linux/Linux.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/plugins/zzogl-pg/opengl/Linux/Linux.cpp b/plugins/zzogl-pg/opengl/Linux/Linux.cpp index aaf3f440a3..44c783815d 100644 --- a/plugins/zzogl-pg/opengl/Linux/Linux.cpp +++ b/plugins/zzogl-pg/opengl/Linux/Linux.cpp @@ -53,7 +53,7 @@ void CALLBACK GSkeyEvent(keyEvent *ev) break; case XK_Escape: - GSclose(); + if (conf.fullscreen()) GLWin.ToggleFullscreen(); break; case XK_Shift_L: @@ -260,7 +260,8 @@ void DisplayDialog() // GtkWidget *wireframe_check, *avi_check; GtkWidget *snap_label, *snap_box, *snap_holder; GtkWidget *size_label, *size_box, *size_holder; - GtkWidget *fullscreen_check, *widescreen_check; +// GtkWidget *fullscreen_check, *widescreen_check; + GtkWidget *fullscreen_label; GtkWidget *advanced_button; GtkWidget *separator; @@ -328,9 +329,10 @@ void DisplayDialog() gtk_box_pack_start(GTK_BOX(snap_holder), snap_label, false, false, 2); gtk_box_pack_start(GTK_BOX(snap_holder), snap_box, false, false, 2); - fullscreen_check = gtk_check_button_new_with_label("Fullscreen"); - gtk_widget_set_tooltip_text(fullscreen_check, "Toggled by pressing Alt-Enter when running."); - widescreen_check = gtk_check_button_new_with_label("Widescreen"); +// fullscreen_check = gtk_check_button_new_with_label("Fullscreen"); +// gtk_widget_set_tooltip_text(fullscreen_check, "Toggled by pressing Alt-Enter when running."); +// widescreen_check = gtk_check_button_new_with_label("Widescreen"); + fullscreen_label = gtk_label_new("Fullscreen is toggled by pressing Alt-Enter when running."); size_label = gtk_label_new("Window Size:"); @@ -380,12 +382,13 @@ void DisplayDialog() // gtk_box_pack_start(GTK_BOX(option_box), wireframe_check, false, false, 2); // gtk_box_pack_start(GTK_BOX(option_box), avi_check, false, false, 2); gtk_box_pack_start(GTK_BOX(option_box), snap_holder, false, false, 2); - gtk_box_pack_start(GTK_BOX(option_box), fullscreen_check, false, false, 2); - gtk_box_pack_start(GTK_BOX(option_box), widescreen_check, false, false, 2); +// gtk_box_pack_start(GTK_BOX(option_box), fullscreen_check, false, false, 2); +// gtk_box_pack_start(GTK_BOX(option_box), widescreen_check, false, false, 2); gtk_box_pack_start(GTK_BOX(option_box), advanced_button, false, false, 2); gtk_box_pack_start(GTK_BOX(option_box), separator, false, false, 2); gtk_box_pack_start(GTK_BOX(option_box), warning_label, false, false, 2); gtk_box_pack_start(GTK_BOX(option_box), skipdraw_holder, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), fullscreen_label, false, false, 2); gtk_box_pack_start(GTK_BOX(main_box), option_frame, false, false, 2); @@ -393,8 +396,8 @@ void DisplayDialog() gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bilinear_check), conf.bilinear); // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wireframe_check), (conf.wireframe())); // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(avi_check), (conf.captureAvi())); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fullscreen_check), (conf.fullscreen())); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widescreen_check), (conf.widescreen())); +// gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fullscreen_check), (conf.fullscreen())); +// gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widescreen_check), (conf.widescreen())); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), main_frame); g_signal_connect_swapped(GTK_OBJECT (advanced_button), "clicked", G_CALLBACK(DisplayAdvancedDialog), advanced_button); @@ -426,8 +429,8 @@ void DisplayDialog() // fake_options.wireframe = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wireframe_check)); // fake_options.capture_avi = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(avi_check)); - fake_options.fullscreen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fullscreen_check)); - fake_options.widescreen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widescreen_check)); +// fake_options.fullscreen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fullscreen_check)); +// fake_options.widescreen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widescreen_check)); fake_options.tga_snap = gtk_combo_box_get_active(GTK_COMBO_BOX(snap_box)); conf.SkipDraw = atoi((char*)gtk_entry_get_text(GTK_ENTRY(skipdraw_text)));