nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added Arctic Ice's 'Nord' theme (#653)

Browse Source 
* Added Arctic Ice's 'Nord' theme
Updated the editor to have the 'Nord' theme as
a theme option.

Signed-off-by: MolassesLover <60114762+MolassesLover@users.noreply.github.com>

* Fixed the knobs and sliders in the 'Nord' theme
This commit adds the same check used for the
'Hacking' theme onto the 'Nord' theme, used to
change `WIDGET_ID_SLIDER_KNOB_IDLE` and
`WIDGET_ID_SCROLLBAR_KNOB_INACTIVE`.

---------

Signed-off-by: MolassesLover <60114762+MolassesLover@users.noreply.github.com>
Co-authored-by: Turánszki János <turanszkij@users.noreply.github.com>
This commit is contained in:
Molasses
2023-03-23 21:12:00 +01:00
committed by GitHub
parent bc715ace64
commit 1bc20f0b1e
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/GeneralWindow.cpp
+18
View File
@@ -256,6 +256,7 @@ void GeneralWindow::Create(EditorComponent* _editor)
Bright,
Soft,
Hacking,
Nord,
};
themeCombo.Create("Theme: ");
@@ -264,6 +265,7 @@ void GeneralWindow::Create(EditorComponent* _editor)
themeCombo.AddItem("Bright " ICON_BRIGHT, (uint64_t)Theme::Bright);
themeCombo.AddItem("Soft " ICON_SOFT, (uint64_t)Theme::Soft);
themeCombo.AddItem("Hacking " ICON_HACKING, (uint64_t)Theme::Hacking);
themeCombo.AddItem("Nord " ICON_NORD, (uint64_t)Theme::Nord);
themeCombo.OnSelect([=](wi::gui::EventArgs args) {
// Dark theme defaults:
@@ -308,7 +310,17 @@ void GeneralWindow::Create(EditorComponent* _editor)
theme.font.color = wi::Color(0, 200, 90, 255);
theme.font.shadow_color = wi::Color::Shadow();
break;
case Theme::Nord:
editor->main->config.GetSection("options").Set("theme", "Nord");
theme_color_idle = wi::Color(46, 52, 64, 255);
theme_color_focus = wi::Color(59, 66, 82, 255);
dark_point = wi::Color(46, 52, 64, 255);
theme.shadow_color = wi::Color(46, 52, 64, 200);
theme.font.color = wi::Color(236, 239, 244, 255);
theme.font.shadow_color = wi::Color::Shadow();
break;
}
editor->main->config.Commit();
theme.tooltipImage = theme.image;
@@ -357,6 +369,12 @@ void GeneralWindow::Create(EditorComponent* _editor)
gui.SetColor(wi::Color(0, 200, 90, 255), wi::gui::WIDGET_ID_SLIDER_KNOB_IDLE);
gui.SetColor(wi::Color(0, 200, 90, 255), wi::gui::WIDGET_ID_SCROLLBAR_KNOB_INACTIVE);
}
if ((Theme)args.userdata == Theme::Nord)
{
gui.SetColor(wi::Color(136, 192, 208, 255), wi::gui::WIDGET_ID_SLIDER_KNOB_IDLE);
gui.SetColor(wi::Color(76, 86, 106, 255), wi::gui::WIDGET_ID_SCROLLBAR_KNOB_INACTIVE);
}
// customize individual elements:
editor->componentsWnd.materialWnd.textureSlotButton.SetColor(wi::Color::White(), wi::gui::IDLE);