From 790bc51c83d7d074eb91d4b6e3e19f41ad49662f Mon Sep 17 00:00:00 2001 From: Thomas Jentzsch Date: Wed, 15 Mar 2023 17:06:52 +0100 Subject: [PATCH] added alternative theme, switchable via hotkey. this is a preparation for SDL2 supporting system theme change events (day/night) soon --- Changes.txt | 4 ++++ docs/graphics/options_misc.png | Bin 4284 -> 4772 bytes docs/index.html | 20 ++++++++++++++++++-- src/common/PKeyboardHandler.cxx | 1 + src/common/jsonDefinitions.hxx | 1 + src/emucore/Event.hxx | 2 +- src/emucore/EventHandler.cxx | 16 ++++++++++++++++ src/emucore/EventHandler.hxx | 7 ++++++- src/emucore/FrameBuffer.cxx | 8 +++++--- src/emucore/Settings.cxx | 8 +++++++- src/gui/UIDialog.cxx | 30 +++++++++++++++++++++--------- src/gui/UIDialog.hxx | 3 ++- 12 files changed, 82 insertions(+), 18 deletions(-) diff --git a/Changes.txt b/Changes.txt index fdac5948c..779db32b2 100644 --- a/Changes.txt +++ b/Changes.txt @@ -22,6 +22,8 @@ * Enhanced Game Properties dialog for multigame ROMs. + * Added 2nd UI theme and hotkey for toggling UI theme. + * Added optional type format detection based on colors used. * Added Joy2B+ controller support. @@ -34,6 +36,8 @@ * Fixed broken 7800 pause key support. + * Fixed broken mouse and Stelladaptor input for Driving Controller. + * Added user defined CPU cycle timers to debugger. * For UNIX systems: Now defaults to using system-installed libsqlite3 diff --git a/docs/graphics/options_misc.png b/docs/graphics/options_misc.png index f4ebf7ca44d5ed5ef61c9c804ce05e55f0e4e947..f8d676b2b9a5430b9dbda7c2de23a7ad2f21384d 100644 GIT binary patch literal 4772 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 Bf@A;y literal 4284 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 SMGk)@K(6Q*YQNINg#I0pug=Z@ diff --git a/docs/index.html b/docs/index.html index c56982542..566b056cc 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2034,6 +2034,11 @@ Alt + Return Cmd + Return + + Toggle UI theme + Alt + T + Cmd + T + Exit Stella Control + Q @@ -3149,7 +3154,17 @@ 
-uipalette <standard|classic|light|dark>
- Use the specified palette for UI elements. + Define default palette/theme for UI elements. + + + + 
-uipalette2 <standard|classic|light|dark>
+ Define alternative palette/theme for UI elements. + + + + 
-altpalette <1|0>
+ Use alternative palette/theme for UI elements. @@ -3850,7 +3865,8 @@ - + + diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx index 2936ba99a..e66ca015d 100644 --- a/src/common/PKeyboardHandler.cxx +++ b/src/common/PKeyboardHandler.cxx @@ -836,6 +836,7 @@ PhysicalKeyboardHandler::DefaultMenuMapping = { {Event::UITabPrev, KBDK_TAB, KBDM_SHIFT | KBDM_CTRL}, {Event::UITabNext, KBDK_TAB, KBDM_CTRL}, + {Event::ToggleUIPalette, KBDK_T, MOD3}, {Event::ToggleFullScreen, KBDK_RETURN, MOD3}, #ifdef BSPF_MACOS diff --git a/src/common/jsonDefinitions.hxx b/src/common/jsonDefinitions.hxx index 642f27ec3..b3e74590f 100644 --- a/src/common/jsonDefinitions.hxx +++ b/src/common/jsonDefinitions.hxx @@ -284,6 +284,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(Event::Type, { {Event::UITabPrev, "UITabPrev"}, {Event::UITabNext, "UITabNext"}, {Event::UIHelp, "UIHelp"}, + {Event::ToggleUIPalette, "ToggleUIPalette" }, {Event::MouseAxisXMove, "MouseAxisXMove"}, {Event::MouseAxisYMove, "MouseAxisYMove"}, {Event::MouseAxisXValue, "MouseAxisXValue"}, diff --git a/src/emucore/Event.hxx b/src/emucore/Event.hxx index 2211351ab..efa863f4d 100644 --- a/src/emucore/Event.hxx +++ b/src/emucore/Event.hxx @@ -148,7 +148,7 @@ class Event SelectHome, SelectEnd, SelectAll, Delete, DeleteLeftWord, DeleteRightWord, DeleteHome, DeleteEnd, Backspace, Cut, Copy, Paste, Undo, Redo, - AbortEdit, EndEdit, + AbortEdit, EndEdit, ToggleUIPalette, HighScoresMenuMode, // Input settings diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index 904273b94..36d53a489 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -237,6 +237,14 @@ void EventHandler::set7800Mode() myIs7800 = false; } +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +void EventHandler::toggleUIPalette() +{ + myOSystem.settings().setValue("altuipalette", !myOSystem.settings().getBool("altuipalette")); + myOSystem.frameBuffer().setUIPalette(); + myOSystem.frameBuffer().update(FrameBuffer::UpdateMode::REDRAW); +} + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void EventHandler::changeMouseControl(int direction) { @@ -529,6 +537,13 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated) } return; + case Event::ToggleUIPalette: + if(pressed && !repeated) + { + toggleUIPalette(); + } + break; + case Event::ToggleFullScreen: if(pressed && !repeated) { @@ -3109,6 +3124,7 @@ EventHandler::MenuActionList EventHandler::ourMenuActionList = { { { Event::UIPrevDir, "Parent directory" }, { Event::ToggleFullScreen, "Toggle fullscreen" }, + { Event::ToggleUIPalette, "Toggle UI theme" }, { Event::Quit, "Quit" } } }; diff --git a/src/emucore/EventHandler.hxx b/src/emucore/EventHandler.hxx index 9d2453278..93e64acd1 100644 --- a/src/emucore/EventHandler.hxx +++ b/src/emucore/EventHandler.hxx @@ -98,6 +98,11 @@ class EventHandler */ void set7800Mode(); + /** + Toggle between UI theme #1 and #2. + */ + void toggleUIPalette(); + /** Collects and dispatches any pending events. This method should be called regularly (at X times per second, where X is the game framerate). @@ -527,7 +532,7 @@ class EventHandler REFRESH_SIZE = 0, #endif EMUL_ACTIONLIST_SIZE = 232 + PNG_SIZE + COMBO_SIZE + REFRESH_SIZE, - MENU_ACTIONLIST_SIZE = 19 + MENU_ACTIONLIST_SIZE = 20 ; // The event(s) assigned to each combination event diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx index 38c18810b..9eef64bc9 100644 --- a/src/emucore/FrameBuffer.cxx +++ b/src/emucore/FrameBuffer.cxx @@ -989,11 +989,13 @@ void FrameBuffer::setTIAPalette(const PaletteArray& rgb_palette) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void FrameBuffer::setUIPalette() { + const Settings& settings = myOSystem.settings(); + const string& key = settings.getBool("altuipalette") ? "uipalette2" : "uipalette"; // Set palette for UI (upper area of full palette) const UIPaletteArray& ui_palette = - (myOSystem.settings().getString("uipalette") == "classic") ? ourClassicUIPalette : - (myOSystem.settings().getString("uipalette") == "light") ? ourLightUIPalette : - (myOSystem.settings().getString("uipalette") == "dark") ? ourDarkUIPalette : + (settings.getString(key) == "classic") ? ourClassicUIPalette : + (settings.getString(key) == "light") ? ourLightUIPalette : + (settings.getString(key) == "dark") ? ourDarkUIPalette : ourStandardUIPalette; for(size_t i = 0, j = myFullPalette.size() - ui_palette.size(); diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx index 92ee2c2b4..307ae6a72 100644 --- a/src/emucore/Settings.cxx +++ b/src/emucore/Settings.cxx @@ -181,6 +181,8 @@ Settings::Settings() setPermanent("dbg.display", 0); #endif setPermanent("uipalette", "standard"); + setPermanent("uipalette2", "dark"); + setPermanent("altuipalette", "false"); setPermanent("hidpi", "false"); setPermanent("listdelay", "300"); setPermanent("mwheel", "4"); @@ -648,9 +650,13 @@ void Settings::usage() << " -lastrom Last played ROM, automatically selected in\n" << " launcher\n" << " -romloadcount Number of ROM to load next from multicard\n" - << " -uipalette \n" + << " -uipalette2 \n" + << " -altuipalette <0|1> Enable alternative GUI theme\n" << " -hidpi <0|1> Enable HiDPI mode\n" << " -dialogfont setToolTip("Primary theme.", Event::ToggleUIPalette, EventMode::kMenuMode); + wid.push_back(myPalette1Popup); + ypos += lineHeight + VGAP; + + myPalette2Popup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, + items, "Theme #2 ", lwidth); + myPalette2Popup->setToolTip("Alternative theme.", Event::ToggleUIPalette, EventMode::kMenuMode); + wid.push_back(myPalette2Popup); ypos += lineHeight + VGAP; // Dialog font @@ -128,8 +135,8 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, wid.push_back(myCenter); // Delay between quick-selecting characters in ListWidget - xpos = HBORDER; ypos += lineHeight + VGAP * 4; - const int swidth = myPalettePopup->getWidth() - lwidth; + xpos = HBORDER; ypos += lineHeight + VGAP * 3; + const int swidth = myPalette1Popup->getWidth() - lwidth; myListDelaySlider = new SliderWidget(myTab, font, xpos, ypos, swidth, lineHeight, "List input delay ", 0, kListDelay, font.getStringWidth("1 second")); @@ -388,8 +395,10 @@ void UIDialog::loadConfig() myLauncherExitWidget->setState(exitlauncher); // UI palette - const string& pal = settings.getString("uipalette"); - myPalettePopup->setSelected(pal, "standard"); + const string& pal1 = settings.getString("uipalette"); + myPalette1Popup->setSelected(pal1, "standard"); + const string& pal2 = settings.getString("uipalette2"); + myPalette2Popup->setSelected(pal2, "dark"); // Dialog font const string& dialogFont = settings.getString("dialogfont"); @@ -478,7 +487,9 @@ void UIDialog::saveConfig() // UI palette settings.setValue("uipalette", - myPalettePopup->getSelectedTag().toString()); + myPalette1Popup->getSelectedTag().toString()); + settings.setValue("uipalette2", + myPalette2Popup->getSelectedTag().toString()); instance().frameBuffer().setUIPalette(); instance().frameBuffer().update(FrameBuffer::UpdateMode::REDRAW); @@ -526,7 +537,8 @@ void UIDialog::setDefaults() switch(myTab->getActiveTab()) { case 0: // Misc. options - myPalettePopup->setSelected("standard"); + myPalette1Popup->setSelected("standard"); + myPalette2Popup->setSelected("dark"); myDialogFontPopup->setSelected("medium", ""); myHidpiWidget->setState(false); myPositionPopup->setSelected("0"); diff --git a/src/gui/UIDialog.hxx b/src/gui/UIDialog.hxx index e3b7172bf..d67e24c84 100644 --- a/src/gui/UIDialog.hxx +++ b/src/gui/UIDialog.hxx @@ -66,7 +66,8 @@ class UIDialog : public Dialog, public CommandSender CheckboxWidget* myLauncherExitWidget{nullptr}; // Misc options - PopUpWidget* myPalettePopup{nullptr}; + PopUpWidget* myPalette1Popup{nullptr}; + PopUpWidget* myPalette2Popup{nullptr}; PopUpWidget* myDialogFontPopup{nullptr}; CheckboxWidget* myHidpiWidget{nullptr}; PopUpWidget* myPositionPopup{nullptr};
ItemBrief descriptionFor more information,
see Command Line
ThemeTheme to use for UI elements (see examples)-uipalette
Theme #1Default theme to use for UI elements (see examples)-uipalette
Theme #2Alternative theme to use for UI elements (see examples)-uipalette2
Dialogs fontThe font used in the dialogs-dialogfont
HiDPI modeScale the UI by a factor of two when enabled-hidpi
Dialogs positionPosition of dialogs with Stella window-dialogpos