From ff33ea5348087d68635d8a79aa006e9cc534ee7f Mon Sep 17 00:00:00 2001 From: arcum42 Date: Wed, 8 Sep 2010 12:03:49 +0000 Subject: [PATCH] GregMiscellaneous: zzogl: Remove screen size settings from the configuration dialog. (The window can be resized normally, and the startup size can be changed in the ini file still...) git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3742 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/zzogl-pg/opengl/GLWin.h | 1 - plugins/zzogl-pg/opengl/Linux/Conf.cpp | 5 ++- plugins/zzogl-pg/opengl/Linux/Linux.cpp | 45 +++++++++++++------------ plugins/zzogl-pg/opengl/Util.h | 4 +-- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/plugins/zzogl-pg/opengl/GLWin.h b/plugins/zzogl-pg/opengl/GLWin.h index 17aa55ce0d..ff3cdfa598 100644 --- a/plugins/zzogl-pg/opengl/GLWin.h +++ b/plugins/zzogl-pg/opengl/GLWin.h @@ -48,7 +48,6 @@ class GLWindow void Force43Ratio(); #endif bool fullScreen, doubleBuffered; - //s32 x, y; u32 width, height, depth; public: diff --git a/plugins/zzogl-pg/opengl/Linux/Conf.cpp b/plugins/zzogl-pg/opengl/Linux/Conf.cpp index e706b90e27..52f95c68fa 100644 --- a/plugins/zzogl-pg/opengl/Linux/Conf.cpp +++ b/plugins/zzogl-pg/opengl/Linux/Conf.cpp @@ -62,6 +62,8 @@ void LoadConfig() conf.bilinear = 1; conf.log = 1; conf.SkipDraw = 0; + conf.width = 800; + conf.height = 600; const std::string iniFile(s_strIniPath + "zzogl-pg.ini"); FILE* f = fopen(iniFile.c_str(), "r"); @@ -100,7 +102,8 @@ void LoadConfig() if (conf.aa > 4) conf.aa = 0; if (conf.width <= 0 || conf.height <= 0) { - conf.set_dimensions(conf.zz_options.dimensions); + conf.width = 800; + conf.height = 600; } if (conf.x < 0 || conf.y < 0) diff --git a/plugins/zzogl-pg/opengl/Linux/Linux.cpp b/plugins/zzogl-pg/opengl/Linux/Linux.cpp index cebfc466cf..8083c4607c 100644 --- a/plugins/zzogl-pg/opengl/Linux/Linux.cpp +++ b/plugins/zzogl-pg/opengl/Linux/Linux.cpp @@ -259,9 +259,10 @@ void DisplayDialog() GtkWidget *aa_label, *aa_box, *aa_holder; // 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_label; +// GtkWidget *size_label, *size_box, *size_holder; +// GtkWidget *fullscreen_check; + GtkWidget *fullscreen_label, *widescreen_check; + GtkWidget *advanced_button; GtkWidget *separator; @@ -334,22 +335,22 @@ void DisplayDialog() widescreen_check = gtk_check_button_new_with_label("Widescreen"); gtk_widget_set_tooltip_text(widescreen_check, "Force a 4:3 ration when disabled"); fullscreen_label = gtk_label_new("Fullscreen is toggled by pressing Alt-Enter when running."); + gtk_label_set_single_line_mode(GTK_LABEL(fullscreen_label), false); + //size_label = gtk_label_new("Window Size:"); - size_label = gtk_label_new("Window Size:"); + //size_box = gtk_combo_box_new_text(); + //gtk_widget_set_tooltip_text(size_box, "No speed impact."); - size_box = gtk_combo_box_new_text(); - gtk_widget_set_tooltip_text(size_box, "No speed impact."); - - gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "640x480"); - gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "800x600"); - gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "1024x768"); - gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "1280x960"); - gtk_combo_box_set_active(GTK_COMBO_BOX(size_box), conf.zz_options.dimensions); - - size_holder = gtk_hbox_new(false, 5); - gtk_box_pack_start(GTK_BOX(size_holder), size_label, false, false, 2); - gtk_box_pack_start(GTK_BOX(size_holder), size_box, false, false, 2); + //gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "640x480"); + //gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "800x600"); + //gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "1024x768"); + //gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "1280x960"); + //gtk_combo_box_set_active(GTK_COMBO_BOX(size_box), conf.zz_options.dimensions); + //size_holder = gtk_hbox_new(false, 5); + //gtk_box_pack_start(GTK_BOX(size_holder), size_label, false, false, 2); + //gtk_box_pack_start(GTK_BOX(size_holder), size_box, false, false, 2); + advanced_button = gtk_button_new_with_label("Advanced..."); separator = gtk_hseparator_new(); @@ -378,7 +379,7 @@ void DisplayDialog() gtk_box_pack_start(GTK_BOX(option_box), bilinear_check, false, false, 2); gtk_box_pack_start(GTK_BOX(option_box), int_holder, false, false, 2); gtk_box_pack_start(GTK_BOX(option_box), aa_holder, false, false, 2); - gtk_box_pack_start(GTK_BOX(option_box), size_holder, false, false, 2); + //gtk_box_pack_start(GTK_BOX(option_box), size_holder, false, false, 2); // 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); @@ -419,10 +420,10 @@ void DisplayDialog() conf.negaa = 0; - if (gtk_combo_box_get_active(GTK_COMBO_BOX(size_box)) != -1) - { - fake_options.dimensions = gtk_combo_box_get_active(GTK_COMBO_BOX(size_box)); - } +// if (gtk_combo_box_get_active(GTK_COMBO_BOX(size_box)) != -1) +// { +// fake_options.dimensions = gtk_combo_box_get_active(GTK_COMBO_BOX(size_box)); +// } conf.log = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(log_check)); @@ -440,7 +441,7 @@ void DisplayDialog() //skipdraw_holder = gtk_hbox_new(false, 5); conf.zz_options = fake_options; - conf.set_dimensions(fake_options.dimensions); + //conf.set_dimensions(fake_options.dimensions); conf.hacks = tempHacks; GSsetGameCRC(g_LastCRC, conf.hacks._u32); diff --git a/plugins/zzogl-pg/opengl/Util.h b/plugins/zzogl-pg/opengl/Util.h index 7d540447e7..efffd3ab33 100644 --- a/plugins/zzogl-pg/opengl/Util.h +++ b/plugins/zzogl-pg/opengl/Util.h @@ -272,8 +272,8 @@ typedef struct break; default: - width = 640; - height = 480; + width = 800; + height = 600; break; } }