diff --git a/res/ComponentLibrary/Rail-dark.svg b/res/ComponentLibrary/Rail-hcdark.svg similarity index 85% rename from res/ComponentLibrary/Rail-dark.svg rename to res/ComponentLibrary/Rail-hcdark.svg index f1f87530..cc46a8ee 100644 --- a/res/ComponentLibrary/Rail-dark.svg +++ b/res/ComponentLibrary/Rail-hcdark.svg @@ -1,80 +1,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + M-0.00002,234.99995h304v-89.99998h-304v89.99998H-0.00002z"/> + - + + - + + M82.87109,220.71796H67.27344v-61.40233h15.59766V220.71796z"/> @@ -217,69 +157,69 @@ + M18.87893,169.45624H17.3555v-1.52344h1.52344C18.87894,167.9328,18.87894,169.45624,18.87893,169.45624z"/> + M18.87893,175.54999H17.3555v-1.52344h1.52344C18.87894,174.02655,18.87894,175.54999,18.87893,175.54999z"/> + M18.87893,181.63983H17.3555v-1.51953h1.52344C18.87894,180.1203,18.87894,181.63983,18.87893,181.63983z"/> + M18.87893,187.73358H17.3555v-1.52344h1.52344C18.87894,186.21014,18.87894,187.73358,18.87893,187.73358z"/> + M18.87893,193.82733H17.3555v-1.52344h1.52344C18.87894,192.30389,18.87894,193.82733,18.87893,193.82733z"/> + M18.87893,199.91718H17.3555v-1.52344h1.52344C18.87894,198.39374,18.87894,199.91718,18.87893,199.91718z"/> + M18.87893,206.01093H17.3555v-1.52344h1.52344C18.87894,204.48749,18.87894,206.01093,18.87893,206.01093z"/> + M18.87893,212.10077H17.3555v-1.52344h1.52344C18.87894,210.57733,18.87894,212.10077,18.87893,212.10077z"/> + M18.87893,170.97968H17.3555v-1.52344h1.52344C18.87894,169.45624,18.87894,170.97968,18.87893,170.97968z"/> + M18.87893,177.07343H17.3555v-1.52344h1.52344C18.87894,175.54999,18.87894,177.07343,18.87893,177.07343z"/> + M18.87893,183.16327H17.3555v-1.51953h1.52344C18.87894,181.64374,18.87894,183.16327,18.87893,183.16327z"/> + M18.87893,189.25702H17.3555v-1.52344h1.52344C18.87894,187.73358,18.87894,189.25702,18.87893,189.25702z"/> + M18.87893,195.35077H17.3555v-1.52344h1.52344C18.87894,193.82733,18.87894,195.35077,18.87893,195.35077z"/> + M18.87893,201.44061H17.3555v-1.52344h1.52344C18.87894,199.91718,18.87894,201.44061,18.87893,201.44061z"/> + M18.87893,207.53436H17.3555v-1.52344h1.52344C18.87894,206.01093,18.87894,207.53436,18.87893,207.53436z"/> + M18.87893,213.62421H17.3555v-1.52344h1.52344C18.87894,212.10077,18.87894,213.62421,18.87893,213.62421z"/> @@ -367,8 +307,8 @@ M125.48046,229.23358h19.18359"/> - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Rail-light.svg b/res/ComponentLibrary/Rail-light.svg index 4a1f50be..9951ee6e 100644 --- a/res/ComponentLibrary/Rail-light.svg +++ b/res/ComponentLibrary/Rail-light.svg @@ -1,564 +1,568 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + diff --git a/src/app/MenuBar.cpp b/src/app/MenuBar.cpp index 1b5f538a..4853db8a 100644 --- a/src/app/MenuBar.cpp +++ b/src/app/MenuBar.cpp @@ -422,8 +422,8 @@ struct ViewButton : MenuButton { menu->addChild(new ui::MenuSeparator); menu->addChild(createMenuLabel("Appearance")); - static const std::vector uiThemes = {"default", "light", "dark"}; - static const std::vector uiThemeLabels = {"Default", "Light", "Dark"}; + static const std::vector uiThemes = {"dark", "light", "hcdark"}; + static const std::vector uiThemeLabels = {"Dark", "Light", "High contrast dark"}; menu->addChild(createIndexSubmenuItem("Theme", uiThemeLabels, [=]() -> size_t { auto it = std::find(uiThemes.begin(), uiThemes.end(), settings::uiTheme); diff --git a/src/app/RailWidget.cpp b/src/app/RailWidget.cpp index cd7711b4..1fa65b83 100644 --- a/src/app/RailWidget.cpp +++ b/src/app/RailWidget.cpp @@ -42,11 +42,11 @@ void RailWidget::step() { if (settings::uiTheme == "light") { railSvg = window::Svg::load(asset::system("res/ComponentLibrary/Rail-light.svg")); } - else if (settings::uiTheme == "dark") { - railSvg = window::Svg::load(asset::system("res/ComponentLibrary/Rail-dark.svg")); + else if (settings::uiTheme == "hcdark") { + railSvg = window::Svg::load(asset::system("res/ComponentLibrary/Rail-hcdark.svg")); } else { - // Default + // Dark railSvg = window::Svg::load(asset::system("res/ComponentLibrary/Rail.svg")); } diff --git a/src/ui/common.cpp b/src/ui/common.cpp index 0d9a6a55..8fb5b337 100644 --- a/src/ui/common.cpp +++ b/src/ui/common.cpp @@ -76,11 +76,11 @@ void refreshTheme() { if (settings::uiTheme == "light") { setTheme(nvgRGB(0xf0, 0xf0, 0xf0), nvgRGB(0x04, 0x04, 0x04)); } - else if (settings::uiTheme == "dark") { + else if (settings::uiTheme == "hcdark") { setTheme(nvgRGB(0x00, 0x00, 0x00), nvgRGB(0xff, 0xff, 0xff)); } else { - // Default + // Dark setTheme(nvgRGB(0x20, 0x20, 0x20), nvgRGB(0xf0, 0xf0, 0xf0)); } }