Darker GUI background
This commit is contained in:
parent
73325e9fe7
commit
fe04cbb597
3 changed files with 5 additions and 3 deletions
|
|
@ -30,6 +30,7 @@ namespace GUIStuff {
|
||||||
std::shared_ptr<Theme> theme(std::make_shared<Theme>());
|
std::shared_ptr<Theme> theme(std::make_shared<Theme>());
|
||||||
theme->fillColor1 = {0.65f, 0.64f, 1.0f, 1.0f};
|
theme->fillColor1 = {0.65f, 0.64f, 1.0f, 1.0f};
|
||||||
theme->fillColor2 = {0.6f, 0.6f, 0.785f, 1.0f};
|
theme->fillColor2 = {0.6f, 0.6f, 0.785f, 1.0f};
|
||||||
|
theme->backColor0 = {0.07f, 0.07f, 0.07f, 1.0f};
|
||||||
theme->backColor1 = {0.156f, 0.156f, 0.18f, 1.0f};
|
theme->backColor1 = {0.156f, 0.156f, 0.18f, 1.0f};
|
||||||
theme->backColor2 = {0.24f, 0.24f, 0.29f, 1.0f};
|
theme->backColor2 = {0.24f, 0.24f, 0.29f, 1.0f};
|
||||||
theme->frontColor1 = {0.87f, 0.87f, 0.87f, 1.0f};
|
theme->frontColor1 = {0.87f, 0.87f, 0.87f, 1.0f};
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,7 @@ SkFont get_setup_skfont();
|
||||||
struct Theme {
|
struct Theme {
|
||||||
SkColor4f fillColor1 = {0.8f, 0.785f, 1.0f, 1.0f};
|
SkColor4f fillColor1 = {0.8f, 0.785f, 1.0f, 1.0f};
|
||||||
SkColor4f fillColor2 = {0.3f, 0.3f, 0.477f, 1.0f};
|
SkColor4f fillColor2 = {0.3f, 0.3f, 0.477f, 1.0f};
|
||||||
|
SkColor4f backColor0 = {0.0f, 0.0f, 0.0f, 1.0f};
|
||||||
SkColor4f backColor1 = {0.0f, 0.0f, 0.0f, 1.0f};
|
SkColor4f backColor1 = {0.0f, 0.0f, 0.0f, 1.0f};
|
||||||
SkColor4f backColor2 = {1.0f, 1.0f, 1.0f, 1.0f};
|
SkColor4f backColor2 = {1.0f, 1.0f, 1.0f, 1.0f};
|
||||||
SkColor4f frontColor1 = {1.0f, 1.0f, 1.0f, 1.0f};
|
SkColor4f frontColor1 = {1.0f, 1.0f, 1.0f, 1.0f};
|
||||||
|
|
|
||||||
|
|
@ -282,7 +282,7 @@ void FileSelectScreen::edit_action_bar() {
|
||||||
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_CENTER },
|
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_CENTER },
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT,
|
.layoutDirection = CLAY_LEFT_TO_RIGHT,
|
||||||
},
|
},
|
||||||
.backgroundColor = convert_vec4<Clay_Color>(gui.io.theme->backColor2),
|
.backgroundColor = convert_vec4<Clay_Color>(gui.io.theme->backColor1),
|
||||||
}) {
|
}) {
|
||||||
if(selectedMenu == SelectedMenu::FILES) {
|
if(selectedMenu == SelectedMenu::FILES) {
|
||||||
edit_action_bar_button("trash", "data/icons/trash.svg", "Trash", [&] {
|
edit_action_bar_button("trash", "data/icons/trash.svg", "Trash", [&] {
|
||||||
|
|
@ -379,7 +379,7 @@ void FileSelectScreen::title_bar() {
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(200), .height = CLAY_SIZING_FIT(0)},
|
.sizing = {.width = CLAY_SIZING_FIT(200), .height = CLAY_SIZING_FIT(0)},
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
},
|
},
|
||||||
.backgroundColor = convert_vec4<Clay_Color>(gui.io.theme->backColor2),
|
.backgroundColor = convert_vec4<Clay_Color>(gui.io.theme->backColor1),
|
||||||
.cornerRadius = CLAY_CORNER_RADIUS(4)
|
.cornerRadius = CLAY_CORNER_RADIUS(4)
|
||||||
}) {
|
}) {
|
||||||
if(moreOptionsMenu == MoreOptionsMenu::MAIN) {
|
if(moreOptionsMenu == MoreOptionsMenu::MAIN) {
|
||||||
|
|
@ -635,7 +635,7 @@ void FileSelectScreen::input_open_infinipaint_file_callback(const CustomEvents::
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileSelectScreen::draw(SkCanvas* canvas) {
|
void FileSelectScreen::draw(SkCanvas* canvas) {
|
||||||
canvas->clear(main.g.gui.io.theme->backColor1);
|
canvas->clear(main.g.gui.io.theme->backColor0);
|
||||||
}
|
}
|
||||||
|
|
||||||
FileSelectScreen::~FileSelectScreen() {
|
FileSelectScreen::~FileSelectScreen() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue