From 1915bf1a61cdaf4df8ce0b466d76f8a12977acfe Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Tue, 11 Aug 2015 23:27:36 +0100 Subject: [PATCH 1/2] gsdx:linux: Fix tooltip and clarify/fix 2 labels Half-pixel offset option now uses the correct tooltip. Offset Hack -> Half-pixel Offset Hack Wild arm Hack -> Wild Arms Hack --- plugins/GSdx/GSLinuxDialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/GSdx/GSLinuxDialog.cpp b/plugins/GSdx/GSLinuxDialog.cpp index a778b3683d..57465e1bba 100644 --- a/plugins/GSdx/GSLinuxDialog.cpp +++ b/plugins/GSdx/GSLinuxDialog.cpp @@ -397,11 +397,11 @@ void populate_shader_table(GtkWidget* shader_table) void populate_hack_table(GtkWidget* hack_table) { - GtkWidget* hack_offset_check = CreateCheckBox("Offset Hack", "UserHacks_HalfPixelOffset"); + GtkWidget* hack_offset_check = CreateCheckBox("Half-pixel Offset Hack", "UserHacks_HalfPixelOffset"); GtkWidget* hack_skipdraw_label = gtk_label_new("Skipdraw:"); GtkWidget* hack_skipdraw_spin = CreateSpinButton(0, 1000, "UserHacks_SkipDraw"); GtkWidget* hack_enble_check = CreateCheckBox("Enable User Hacks", "UserHacks"); - GtkWidget* hack_wild_check = CreateCheckBox("Wild arm Hack", "UserHacks_WildHack"); + GtkWidget* hack_wild_check = CreateCheckBox("Wild Arms Hack", "UserHacks_WildHack"); GtkWidget* hack_tco_label = gtk_label_new("Texture Offset: 0x"); GtkWidget* hack_tco_entry = CreateTextBox("UserHacks_TCOffset"); GtkWidget* align_sprite_check = CreateCheckBox("Align sprite hack", "UserHacks_align_sprite_X"); @@ -412,7 +412,7 @@ void populate_hack_table(GtkWidget* hack_table) GtkWidget* stretch_hack_label = gtk_label_new("Align Sprite Texture:"); // Reuse windows helper string :) - AddTooltip(hack_offset_check, IDC_TCOFFSETX); + AddTooltip(hack_offset_check, IDC_OFFSETHACK); AddTooltip(hack_skipdraw_label, IDC_SKIPDRAWHACK); AddTooltip(hack_skipdraw_spin, IDC_SKIPDRAWHACK); gtk_widget_set_tooltip_text(hack_enble_check, "Allow to use hack below"); From 63c26c45ec757a8084b7ab6e0b334ff3eea7114d Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Mon, 10 Aug 2015 22:01:45 +0100 Subject: [PATCH 2/2] gsdx: Clean up Wild Arms hack cruft The Wild Arms Offset hack can only be on or off. There is no third state. Convert the three-state checkbox into a two-state checkbox, fix the description and remove a leftover. --- plugins/GSdx/GSDeviceDX.h | 1 - plugins/GSdx/GSSetting.cpp | 5 +---- plugins/GSdx/GSdx.rc | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/GSdx/GSDeviceDX.h b/plugins/GSdx/GSDeviceDX.h index be2cacc9fe..680b22744a 100644 --- a/plugins/GSdx/GSDeviceDX.h +++ b/plugins/GSdx/GSDeviceDX.h @@ -76,7 +76,6 @@ public: uint32 fst:1; uint32 logz:1; uint32 rtcopy:1; - uint32 wildhack:2; }; uint32 key; diff --git a/plugins/GSdx/GSSetting.cpp b/plugins/GSdx/GSSetting.cpp index 2ec081c914..6641bd67c7 100644 --- a/plugins/GSdx/GSSetting.cpp +++ b/plugins/GSdx/GSSetting.cpp @@ -70,10 +70,7 @@ const char* dialog_message(int ID, bool* updateText) { " Half option is the preferred one. Use it for Mana Khemia or Ar Tonelico for example." " Full can be used for Tales of Destiny."; case IDC_WILDHACK: - return "WildArms\n\nLowers the GS precision to avoid gaps between pixels when" - " upscaling. Full option fixes the text on WildArms games, while Half option might improve portraits" - " in Ar Tonelico.\n\n" - "Strech hack might work too"; + return "Wild Arms\n\nLowers the GS precision to avoid gaps between pixels when upscaling. Fixes the text on Wild Arms games."; case IDC_MSAACB: case IDC_STATIC_MSAA: return "Multisample Anti-Aliasing\n\nEnables hardware Anti-Aliasing. Needs lots of memory." diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index 5b5e3d8214..542ac3a073 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -106,7 +106,7 @@ BEGIN CONTROL "Sprite",IDC_SPRITEHACK,"Button",BS_AUTO3STATE | WS_TABSTOP,14,117,35,10 LTEXT "USE AT YOUR OWN RISK!",IDC_STATIC,7,276,84,11,WS_DISABLED COMBOBOX IDC_MSAACB,35,18,54,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "WildArmsOffset",IDC_WILDHACK,"Button",BS_AUTO3STATE | WS_TABSTOP,14,134,64,10 + CONTROL "Wild Arms Offset",IDC_WILDHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,134,64,10 LTEXT "TEXT_GOES_HERE",IDC_HACK_DESCRIPTION,102,20,199,192 CONTROL "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,151,66,10 CONTROL "Round Sprite",IDC_ROUND_SPRITE,"Button",BS_AUTO3STATE | WS_TABSTOP,14,168,66,8