medfall

A super great game engine
Log | Files | Refs

commit 0a874caf0a61dd7b1b7b003162389e05e77e075a
parent b1c9bbc3137584cec626c2d026f47d1178362b59
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun Jul  2 00:12:01 +0300

Nicer launcher colours

Diffstat:
launcher/main.cc | 31++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/launcher/main.cc b/launcher/main.cc @@ -568,7 +568,7 @@ int main() { ImGuiStyle & style = ImGui::GetStyle(); style.WindowRounding = 0; style.FramePadding = ImVec2( 8, 8 ); - style.Colors[ ImGuiCol_WindowBg ] = ImColor( 40, 51, 54 ); + style.Colors[ ImGuiCol_WindowBg ] = ImColor( 0x26, 0x39, 0x78 ); style.ItemSpacing.y = 8; } @@ -610,7 +610,7 @@ int main() { ); ImGui::PushItemWidth( 900 ); - ImGui::PushStyleColor( ImGuiCol_Text, ImColor( 245, 250, 255 ) ); + ImGui::PushStyleColor( ImGuiCol_Text, ImColor( 255, 255, 255 ) ); ImGui::PushFont( verylarge ); ImGui::Text( "Medfall!!!!!!!" ); ImGui::PopFont(); @@ -635,9 +635,10 @@ int main() { ImGui::PushFont( large ); if( updater->state == UPDATER_READY ) { - ImGui::PushStyleColor( ImGuiCol_Button, ImColor( 32, 128, 64 ) ); - ImGui::PushStyleColor( ImGuiCol_ButtonHovered, ImColor( 32, 192, 64 ) ); - ImGui::PushStyleColor( ImGuiCol_ButtonActive, ImColor( 32, 225, 96 ) ); + ImGui::PushStyleColor( ImGuiCol_Button, ImColor( 0x29, 0x8a, 0x67 ) ); + ImGui::PushStyleColor( ImGuiCol_ButtonHovered, ImColor( 0x30, 0xa1, 0x78 ) ); + ImGui::PushStyleColor( ImGuiCol_ButtonActive, ImColor( 0x38, 0xb9, 0x8a ) ); + bool launch = ImGui::Button( "Run fae crabs with mortalengine", ImVec2( -1, 50 ) ); ImGui::PopStyleColor( 3 ); @@ -646,9 +647,9 @@ int main() { } } else if( updater->state == UPDATER_NEED_UPDATE ) { - ImGui::PushStyleColor( ImGuiCol_Button, ImColor( 128, 128, 64 ) ); - ImGui::PushStyleColor( ImGuiCol_ButtonHovered, ImColor( 192, 192, 64 ) ); - ImGui::PushStyleColor( ImGuiCol_ButtonActive, ImColor( 225, 225, 96 ) ); + ImGui::PushStyleColor( ImGuiCol_Button, ImColor( 0x29, 0x8a, 0x67 ) ); + ImGui::PushStyleColor( ImGuiCol_ButtonHovered, ImColor( 0x30, 0xa1, 0x78 ) ); + ImGui::PushStyleColor( ImGuiCol_ButtonActive, ImColor( 0x38, 0xb9, 0x8a ) ); str< 256 > button_text( "Update to v{}.{}.{}.{} - {.2}Mb", updater->remote_version.a, @@ -691,7 +692,7 @@ int main() { download_speed_set = true; } - ImGui::PushStyleColor( ImGuiCol_PlotHistogram, ImColor( 255, 0, 0 ) ); + ImGui::PushStyleColor( ImGuiCol_PlotHistogram, ImColor( 0x29, 0x8a, 0x67 ) ); str< 256 > progress_text( "{.2}/{.2}Mb. {.2}% {.2}Kb/s", total_downloaded / 1024.0 / 1024.0, updater->update_size / 1024.0 / 1024.0, @@ -709,16 +710,16 @@ int main() { } } else if( updater->state == UPDATER_INSTALLING ) { - ImGui::PushStyleColor( ImGuiCol_Button, ImColor( 0, 0, 0 ) ); - ImGui::PushStyleColor( ImGuiCol_ButtonHovered, ImColor( 0, 0, 0 ) ); - ImGui::PushStyleColor( ImGuiCol_ButtonActive, ImColor( 0, 0, 0 ) ); + ImGui::PushStyleColor( ImGuiCol_Button, ImColor( 0x1c, 0x2a, 0x59 ) ); + ImGui::PushStyleColor( ImGuiCol_ButtonHovered, ImColor( 0x1c, 0x2a, 0x59 ) ); + ImGui::PushStyleColor( ImGuiCol_ButtonActive, ImColor( 0x1c, 0x2a, 0x59 ) ); ImGui::Button( "Installing update...", ImVec2( -1, 50 ) ); ImGui::PopStyleColor( 3 ); } else { - ImGui::PushStyleColor( ImGuiCol_Button, ImColor( 0, 0, 0 ) ); - ImGui::PushStyleColor( ImGuiCol_ButtonHovered, ImColor( 0, 0, 0 ) ); - ImGui::PushStyleColor( ImGuiCol_ButtonActive, ImColor( 0, 0, 0 ) ); + ImGui::PushStyleColor( ImGuiCol_Button, ImColor( 0x1c, 0x2a, 0x59 ) ); + ImGui::PushStyleColor( ImGuiCol_ButtonHovered, ImColor( 0x1c, 0x2a, 0x59 ) ); + ImGui::PushStyleColor( ImGuiCol_ButtonActive, ImColor( 0x1c, 0x2a, 0x59 ) ); ImGui::Button( "Checking for updates...", ImVec2( -1, 50 ) ); ImGui::PopStyleColor( 3 ); }