Skip to content

style configurator - fix orange theme bug and dark mode default (#550) #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mariuz merged 2 commits into from
Apr 29, 2026
+12 −5
Merged

style configurator - fix orange theme bug and dark mode default (#550) #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78134ea
style configurator - fix orange theme bug and dark mode default (#550)
mariuz Apr 29, 2026
d329538
style configurator - address code review suggestions (#550)
mariuz Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conf-defs/fr_settings.confdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@
<caption> </caption>
<description>Select the file with the primary style</description>
<key>StyleTheme</key>
<default>styles</default>
<default>stylers</default>
<aligngroup>1</aligngroup>
<file>StyleTheme</file>
</setting>
Expand Down
3 changes: 2 additions & 1 deletion src/gui/FRStyleManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

#include "FRStyleManager.h"

const wxString FRStyleManager::_DARKMODEDEFAULT = "DarkModeDefault";

FRStyleManager& stylerManager()
{
Expand Down Expand Up @@ -349,7 +350,7 @@ void FRStyleManager::loadConfig()
// user's explicit Preferences choice still wins.
const wxString systemDefault =
wxSystemSettings::GetAppearance().IsDark()
? wxString("DarkModeDefault")
? _DARKMODEDEFAULT
: _default;

wxString fileName = config().get(_PRYMARY, systemDefault);
Expand Down
2 changes: 2 additions & 0 deletions src/gui/FRStyleManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class FRStyleManager : public Subject
const wxString _SECONDARY = "StyleThemeSecondary";
const wxString _STYLEACTIVE = "StyleActive";
const wxString _default = "stylers";
public:
static const wxString _DARKMODEDEFAULT;

wxFileName fileNamePrimaryM;
wxFileName fileNameSecondaryM;
Expand Down
8 changes: 6 additions & 2 deletions src/gui/PreferencesDialogStyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,10 @@ bool PrefDlgStyleSetting::loadFromTargetConfig(Config& config)
if (fileComboBoxM)
{
wxString value = defaultM;
config.getValue(keyM, value);
// If system is dark and no value in config, use DarkModeDefault
if (!config.getValue(keyM, value) && wxSystemSettings::GetAppearance().IsDark())
value = FRStyleManager::_DARKMODEDEFAULT;

fileComboBoxM->SetValue(value);

loadStylers(fileComboBoxM->GetValue());
Expand All @@ -229,7 +232,8 @@ bool PrefDlgStyleSetting::loadFromTargetConfig(Config& config)
if (fileSecondaryComboBoxM)
{
wxString value = defaultM;
config.getValue("StyleThemeSecondary", value);
if (!config.getValue("StyleThemeSecondary", value) && wxSystemSettings::GetAppearance().IsDark())
value = FRStyleManager::_DARKMODEDEFAULT;
fileSecondaryComboBoxM->SetValue(value);
}

Expand Down
2 changes: 1 addition & 1 deletion xml-styles/stylers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</LexerStyles>
<GlobalStyles>
<!-- Attention : Don't modify the name of styleID="0" -->
<WidgetStyle name="Global override" styleID="0" fgColor="FFFF80" bgColor="FF8000" fontName="Courier New" fontStyle="0" fontSize="10" caseVisible="0"/>
<WidgetStyle name="Global override" styleID="0" fgColor="000000" bgColor="FFFFFF" fontName="Courier New" fontStyle="0" fontSize="10" caseVisible="0"/>
<WidgetStyle name="Default Style" styleID="32" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" caseVisible="0"/>
<WidgetStyle name="Indent guideline style" styleID="37" fgColor="C0C0C0" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" caseVisible="0"/>
<WidgetStyle name="Brace highlight style" styleID="34" fgColor="FF0000" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" caseVisible="0"/>
Expand Down
Loading