Skip to content
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

Jump to bottom

UI: Change default UMF colors for better contrast #13781

Merged
merged 1 commit into from
May 6, 2024
Merged

UI: Change default UMF colors for better contrast #13781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Mod/Measure/App/Preferences.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
App::Color Preferences::defaultLineColor()
{
App::Color fcColor;
fcColor.setPackedValue(getPreferenceGroup("Appearance")->GetUnsigned("DefaultLineColor", 0xFFFFFFFF));
fcColor.setPackedValue(getPreferenceGroup("Appearance")->GetUnsigned("DefaultLineColor", 0x3CF00000));

Check warning on line 49 in src/Mod/Measure/App/Preferences.cpp

View workflow job for this annotation

GitHub Actions / Lint / Lint 

0x3CF00000 is a magic number; consider replacing it with a named constant [cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers]
return fcColor;
}

Expand All @@ -60,7 +60,7 @@
App::Color Preferences::defaultTextBackgroundColor()
{
App::Color fcColor;
fcColor.setPackedValue(getPreferenceGroup("Appearance")->GetUnsigned("DefaultTextBackgroundColor", 0xFFFFFFFF));
fcColor.setPackedValue(getPreferenceGroup("Appearance")->GetUnsigned("DefaultTextBackgroundColor", 0x3CF00000));

Check warning on line 63 in src/Mod/Measure/App/Preferences.cpp

View workflow job for this annotation

GitHub Actions / Lint / Lint 

0x3CF00000 is a magic number; consider replacing it with a named constant [cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers]
return fcColor;
}

Expand All @@ -71,7 +71,7 @@

int Preferences::defaultFontSize()
{
return getPreferenceGroup("Appearance")->GetInt("DefaultFontSize", 18);

Check warning on line 74 in src/Mod/Measure/App/Preferences.cpp

View workflow job for this annotation

GitHub Actions / Lint / Lint 

narrowing conversion from 'long' to signed type 'int' is implementation-defined [bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions]

Check warning on line 74 in src/Mod/Measure/App/Preferences.cpp

View workflow job for this annotation

GitHub Actions / Lint / Lint 

18 is a magic number; consider replacing it with a named constant [cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers]
}

bool Preferences::defaultMirror()
Expand Down
10 changes: 5 additions & 5 deletions src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@
</property>
<property name="color">
<color>
<red>255</red>
<green>255</green>
<blue>255</blue>
<red>60</red>
<green>240</green>
<blue>0</blue>
</color>
</property>
<property name="prefEntry" stdset="0">
Expand Down Expand Up @@ -180,8 +180,8 @@
<widget class="Gui::PrefColorButton" name="cbBackground">
<property name="color">
<color>
<red>0</red>
<green>0</green>
<red>60</red>
<green>240</green>
<blue>0</blue>
</color>
</property>
Expand Down