diff --git a/src/visual/menu/menu/objects/TabButton.cpp b/src/visual/menu/menu/objects/TabButton.cpp index 09b0a2c2..da473abe 100644 --- a/src/visual/menu/menu/objects/TabButton.cpp +++ b/src/visual/menu/menu/objects/TabButton.cpp @@ -4,10 +4,10 @@ #include -static settings::RVariable color_selected{ "zk.style.tab-button.color.selected.background", "079797" }; -static settings::RVariable color_separator{ "zk.style.tab-button.color.separator", "079797" }; -static settings::RVariable color_hover_underline{ "zk.style.tab-button.color.hover.underline", "079797" }; -static settings::RVariable color_selected_underline{ "zk.style.tab-button.color.selected.underline", "079797" }; +static settings::RVariable color_selected{ "zk.style.tab-button.color.selected.background", "446498ff" }; +static settings::RVariable color_separator{ "zk.style.tab-button.color.separator", "446498ff" }; +static settings::RVariable color_hover_underline{ "zk.style.tab-button.color.hover.underline", "446498ff" }; +static settings::RVariable color_selected_underline{ "zk.style.tab-button.color.selected.underline", "446498ff" }; static settings::RVariable color_text_selected{ "zk.style.tab-button.color.text.selected", "ffffff" }; static settings::RVariable color_text{ "zk.style.tab-button.color.text.inactive", "cccccc" }; diff --git a/src/visual/menu/menu/objects/Tooltip.cpp b/src/visual/menu/menu/objects/Tooltip.cpp index fdf20690..ba9b6058 100644 --- a/src/visual/menu/menu/objects/Tooltip.cpp +++ b/src/visual/menu/menu/objects/Tooltip.cpp @@ -7,7 +7,7 @@ #include static settings::RVariable color_background{ "zk.style.tooltip.background", "00000055" }; -static settings::RVariable color_border{ "zk.style.tooltip.border", "079797" }; +static settings::RVariable color_border{ "zk.style.tooltip.border", "446498ff" }; namespace zerokernel { diff --git a/src/visual/menu/menu/objects/container/Box.cpp b/src/visual/menu/menu/objects/container/Box.cpp index 9ee42deb..275d34a1 100644 --- a/src/visual/menu/menu/objects/container/Box.cpp +++ b/src/visual/menu/menu/objects/container/Box.cpp @@ -10,7 +10,7 @@ #include -static settings::RVariable color_border{ "zk.style.box.color.border", "079797" }; +static settings::RVariable color_border{ "zk.style.box.color.border", "446498ff" }; void zerokernel::Box::render() { diff --git a/src/visual/menu/menu/objects/container/ModalColorSelect.cpp b/src/visual/menu/menu/objects/container/ModalColorSelect.cpp index b0799208..3cf4809e 100644 --- a/src/visual/menu/menu/objects/container/ModalColorSelect.cpp +++ b/src/visual/menu/menu/objects/container/ModalColorSelect.cpp @@ -4,7 +4,7 @@ #include -static settings::RVariable color_border{ "zk.style.color-preview.color.border", "079797" }; +static settings::RVariable color_border{ "zk.style.color-preview.color.border", "446498ff" }; namespace zerokernel { diff --git a/src/visual/menu/menu/objects/container/ModalContainer.cpp b/src/visual/menu/menu/objects/container/ModalContainer.cpp index 381a5bff..e677413c 100644 --- a/src/visual/menu/menu/objects/container/ModalContainer.cpp +++ b/src/visual/menu/menu/objects/container/ModalContainer.cpp @@ -9,7 +9,7 @@ Created on 26.07.18. */ -static settings::RVariable color_border{ "zk.style.modal-container.color.border", "079797" }; +static settings::RVariable color_border{ "zk.style.modal-container.color.border", "446498ff" }; static settings::RVariable color_background{ "zk.style.modal-container.color.background", "1d2f40" }; bool zerokernel::ModalContainer::handleSdlEvent(SDL_Event *event) diff --git a/src/visual/menu/menu/objects/container/TabSelection.cpp b/src/visual/menu/menu/objects/container/TabSelection.cpp index 956f2fdf..003167b8 100644 --- a/src/visual/menu/menu/objects/container/TabSelection.cpp +++ b/src/visual/menu/menu/objects/container/TabSelection.cpp @@ -5,7 +5,7 @@ #include #include -static settings::RVariable color_border{ "zk.style.tab-selection.color.border", "079797" }; +static settings::RVariable color_border{ "zk.style.tab-selection.color.border", "446498ff" }; namespace zerokernel { diff --git a/src/visual/menu/menu/objects/container/Table.cpp b/src/visual/menu/menu/objects/container/Table.cpp index f4a8a00e..03eb37e9 100644 --- a/src/visual/menu/menu/objects/container/Table.cpp +++ b/src/visual/menu/menu/objects/container/Table.cpp @@ -5,7 +5,7 @@ #include #include -static settings::RVariable color_border{ "zk.style.table.color.border", "079797" }; +static settings::RVariable color_border{ "zk.style.table.color.border", "446498ff" }; void zerokernel::Table::render() { diff --git a/src/visual/menu/menu/objects/input/Checkbox.cpp b/src/visual/menu/menu/objects/input/Checkbox.cpp index 7124b1a0..8e4606e8 100644 --- a/src/visual/menu/menu/objects/input/Checkbox.cpp +++ b/src/visual/menu/menu/objects/input/Checkbox.cpp @@ -6,9 +6,9 @@ #include static settings::RVariable checkbox_size{ "zk.style.checkbox.size", "12" }; -static settings::RVariable color_border{ "zk.style.checkbox.color.border", "079797" }; -static settings::RVariable color_checked{ "zk.style.checkbox.color.checked", "079797" }; -static settings::RVariable color_hover{ "zk.style.checkbox.color.hover", "07979777" }; +static settings::RVariable color_border{ "zk.style.checkbox.color.border", "446498ff" }; +static settings::RVariable color_checked{ "zk.style.checkbox.color.checked", "446498ff" }; +static settings::RVariable color_hover{ "zk.style.checkbox.color.hover", "446498ff77" }; bool zerokernel::Checkbox::onLeftMouseClick() { diff --git a/src/visual/menu/menu/objects/input/ColorSelector.cpp b/src/visual/menu/menu/objects/input/ColorSelector.cpp index cdc66133..4d74f9e1 100644 --- a/src/visual/menu/menu/objects/input/ColorSelector.cpp +++ b/src/visual/menu/menu/objects/input/ColorSelector.cpp @@ -10,7 +10,7 @@ static settings::RVariable default_width{ "zk.style.input.color.width", "36" }; static settings::RVariable default_height{ "zk.style.input.color.height", "14" }; -static settings::RVariable border{ "zk.style.input.color.border", "079797" }; +static settings::RVariable border{ "zk.style.input.color.border", "446498ff" }; namespace zerokernel { diff --git a/src/visual/menu/menu/objects/input/InputKey.cpp b/src/visual/menu/menu/objects/input/InputKey.cpp index 5bb4727a..688e204c 100644 --- a/src/visual/menu/menu/objects/input/InputKey.cpp +++ b/src/visual/menu/menu/objects/input/InputKey.cpp @@ -7,7 +7,7 @@ static settings::RVariable default_width{ "zk.style.input.key.width", "60" }; static settings::RVariable default_height{ "zk.style.input.key.height", "14" }; -static settings::RVariable color_border{ "zk.style.input.key.color.border", "079797" }; +static settings::RVariable color_border{ "zk.style.input.key.color.border", "446498ff" }; static settings::RVariable color_background_capturing{ "zk.style.input.key.color.background.capturing", "38b28f88" }; zerokernel::InputKey::InputKey() : BaseMenuObject{} diff --git a/src/visual/menu/menu/objects/input/Select.cpp b/src/visual/menu/menu/objects/input/Select.cpp index 71a58e29..079e87e8 100644 --- a/src/visual/menu/menu/objects/input/Select.cpp +++ b/src/visual/menu/menu/objects/input/Select.cpp @@ -7,7 +7,7 @@ #include #include -static settings::RVariable color_border{ "zk.style.input.select.border", "079797" }; +static settings::RVariable color_border{ "zk.style.input.select.border", "446498ff" }; static settings::RVariable default_width{ "zk.style.input.select.width", "60" }; static settings::RVariable default_height{ "zk.style.input.select.height", "14" }; diff --git a/src/visual/menu/menu/objects/input/Slider.cpp b/src/visual/menu/menu/objects/input/Slider.cpp index 97f6ede3..2d52b540 100644 --- a/src/visual/menu/menu/objects/input/Slider.cpp +++ b/src/visual/menu/menu/objects/input/Slider.cpp @@ -15,6 +15,6 @@ settings::RVariable SliderStyle::handle_width{ "zk.style.input.slider.handl settings::RVariable SliderStyle::bar_width{ "zk.style.input.slider.bar_width", "2" }; settings::RVariable SliderStyle::handle_body{ "zk.style.input.slider.color.handle_body", "1d2f40" }; -settings::RVariable SliderStyle::handle_border{ "zk.style.input.slider.color.handle_border", "079797" }; -settings::RVariable SliderStyle::bar_color{ "zk.style.input.slider.color.bar", "079797" }; +settings::RVariable SliderStyle::handle_border{ "zk.style.input.slider.color.handle_border", "446498ff" }; +settings::RVariable SliderStyle::bar_color{ "zk.style.input.slider.color.bar", "446498ff" }; } // namespace zerokernel \ No newline at end of file diff --git a/src/visual/menu/menu/objects/input/TextInput.cpp b/src/visual/menu/menu/objects/input/TextInput.cpp index ac5caf58..e2ad1063 100644 --- a/src/visual/menu/menu/objects/input/TextInput.cpp +++ b/src/visual/menu/menu/objects/input/TextInput.cpp @@ -4,8 +4,8 @@ #include -static settings::RVariable color_border_active{ "zk.style.input.text.color.border.active", "38b28f" }; -static settings::RVariable color_border{ "zk.style.input.text.color.border.inactive", "079797" }; +static settings::RVariable color_border_active{ "zk.style.input.text.color.border.active", "42BC99ff" }; +static settings::RVariable color_border{ "zk.style.input.text.color.border.inactive", "446498ff" }; static settings::RVariable color_text_active{ "zk.style.input.text.color.text.active", "ffffff" }; static settings::RVariable color_text{ "zk.style.input.text.color.text.inactive", "aaaaaa" }; diff --git a/src/visual/menu/menu/special/TreeListBaseEntry.cpp b/src/visual/menu/menu/special/TreeListBaseEntry.cpp index b86c5649..69083923 100644 --- a/src/visual/menu/menu/special/TreeListBaseEntry.cpp +++ b/src/visual/menu/menu/special/TreeListBaseEntry.cpp @@ -10,7 +10,7 @@ */ static settings::RVariable background_hover{ "zk.style.tree-list-entry.color.hover", "38b28f66" }; -static settings::RVariable lines{ "zk.style.tree-list-entry.color.lines", "38b28f" }; +static settings::RVariable lines{ "zk.style.tree-list-entry.color.lines", "42BC99ff" }; bool zerokernel::TreeListBaseEntry::handleSdlEvent(SDL_Event *event) { diff --git a/src/visual/menu/menu/wm/Task.cpp b/src/visual/menu/menu/wm/Task.cpp index 46809d84..33dca41c 100644 --- a/src/visual/menu/menu/wm/Task.cpp +++ b/src/visual/menu/menu/wm/Task.cpp @@ -12,8 +12,8 @@ static settings::RVariable color_closed{ "zk.style.task.color.text.close static settings::RVariable color_focused{ "zk.style.task.color.text.focused", "ffffff" }; static settings::RVariable color_open{ "zk.style.task.color.text.open", "cccccc" }; -static settings::RVariable color_hovered{ "zk.style.task.color.background.hover", "079797" }; -static settings::RVariable color_border{ "zk.style.task.color.border", "079797" }; +static settings::RVariable color_hovered{ "zk.style.task.color.background.hover", "446498ff" }; +static settings::RVariable color_border{ "zk.style.task.color.border", "446498ff" }; void zerokernel::Task::render() { diff --git a/src/visual/menu/menu/wm/TaskBar.cpp b/src/visual/menu/menu/wm/TaskBar.cpp index 52b6b7b7..df6f0749 100644 --- a/src/visual/menu/menu/wm/TaskBar.cpp +++ b/src/visual/menu/menu/wm/TaskBar.cpp @@ -8,7 +8,7 @@ #include static settings::RVariable color_background{ "zk.style.taskbar.color.background", "1d2f40" }; -static settings::RVariable color_border{ "zk.style.taskbar.color.border", "079797" }; +static settings::RVariable color_border{ "zk.style.taskbar.color.border", "446498ff" }; void zerokernel::TaskBar::reorderElements() { diff --git a/src/visual/menu/menu/wm/WMWindow.cpp b/src/visual/menu/menu/wm/WMWindow.cpp index 3319bc29..2ded1acf 100644 --- a/src/visual/menu/menu/wm/WMWindow.cpp +++ b/src/visual/menu/menu/wm/WMWindow.cpp @@ -11,7 +11,7 @@ #include #include -static settings::RVariable color_border{ "zk.style.window.color.border", "079797" }; +static settings::RVariable color_border{ "zk.style.window.color.border", "446498ff" }; static settings::RVariable color_background{ "zk.style.window.color.background.active", "1d2f40" }; static settings::RVariable color_background_inactive{ "zk.style.window.color.background.inactive", "1d2f4088" }; diff --git a/src/visual/menu/menu/wm/WindowCloseButton.cpp b/src/visual/menu/menu/wm/WindowCloseButton.cpp index 9ba4b869..e1f6ee6e 100644 --- a/src/visual/menu/menu/wm/WindowCloseButton.cpp +++ b/src/visual/menu/menu/wm/WindowCloseButton.cpp @@ -11,7 +11,7 @@ static draw::Texture cross{ DATA_PATH "/menu/cross.png" }; static settings::RVariable background_hover{ "zk.style.window-close-button.color.background-hover", "ff0000" }; -static settings::RVariable color_border{ "zk.style.window-close-button.color.border", "079797" }; +static settings::RVariable color_border{ "zk.style.window-close-button.color.border", "446498ff" }; void zerokernel::WindowCloseButton::render() { diff --git a/src/visual/menu/menu/wm/WindowHeader.cpp b/src/visual/menu/menu/wm/WindowHeader.cpp index 0edd451d..350a76db 100644 --- a/src/visual/menu/menu/wm/WindowHeader.cpp +++ b/src/visual/menu/menu/wm/WindowHeader.cpp @@ -9,9 +9,9 @@ */ static settings::RVariable color_background{ "zk.style.window-header.color.background.inactive", "00000000" }; -static settings::RVariable color_background_focused{ "zk.style.window-header.color.background.active", "079797" }; -static settings::RVariable color_border{ "zk.style.window-header.color.border.inactive", "079797" }; -static settings::RVariable color_border_focused{ "zk.style.window-header.color.border.active", "079797" }; +static settings::RVariable color_background_focused{ "zk.style.window-header.color.background.active", "446498ff" }; +static settings::RVariable color_border{ "zk.style.window-header.color.border.inactive", "446498ff" }; +static settings::RVariable color_border_focused{ "zk.style.window-header.color.border.active", "446498ff" }; zerokernel::WindowHeader::WindowHeader(WMWindow &window) : BaseMenuObject(), window(window), close() {