mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-22 17:32:19 -05:00
Code Issues Projects Releases Wiki Activity

Check Tracker - Fixes colours not initializing correctly in Check Tracker settings (#2141)

Browse Source
This commit is contained in:
sonoftunk 2022-12-11 13:14:50 -05:00 committed by GitHub
parent 41db15be48
commit 15c8ccd0cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View File

@ -901,8 +901,8 @@ void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName,
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
if (UIWidgets::EnhancementColor("Check", cvarMainName, if (UIWidgets::EnhancementColor("Check", cvarMainName,
ImVec4(main_color.r / 255.0f, main_color.g / 255.0f, main_color.b / 255.0f, main_color.a / 255.0f), ImVec4(main_color.r, main_color.g, main_color.b, main_color.a),
ImVec4(main_default_color.r / 255.0f, main_default_color.g / 255.0f, main_default_color.b / 255.0f, main_default_color.a / 255.0f))) ImVec4(main_default_color.r, main_default_color.g, main_default_color.b, main_default_color.a)))
{ {
main_color = CVar_GetRGBA(cvarMainName, main_default_color); main_color = CVar_GetRGBA(cvarMainName, main_default_color);
}; };
@ -912,8 +912,8 @@ void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName,
ImGui::AlignTextToFramePadding(); ImGui::AlignTextToFramePadding();
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
if (UIWidgets::EnhancementColor("Details", cvarExtraName, if (UIWidgets::EnhancementColor("Details", cvarExtraName,
ImVec4(extra_color.r / 255.0f, extra_color.g / 255.0f, extra_color.b / 255.0f, extra_color.a / 255.0f), ImVec4(extra_color.r, extra_color.g, extra_color.b, extra_color.a),
ImVec4(extra_default_color.r / 255.0f, extra_default_color.g / 255.0f, extra_default_color.b / 255.0f, extra_default_color.a / 255.0f))) ImVec4(extra_default_color.r, extra_default_color.g, extra_default_color.b, extra_default_color.a)))
{ {
extra_color = CVar_GetRGBA(cvarExtraName, extra_default_color); extra_color = CVar_GetRGBA(cvarExtraName, extra_default_color);
} }
@ -952,8 +952,8 @@ void DrawCheckTrackerOptions(bool& open) {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
if (UIWidgets::EnhancementColor("BG Color", "gCheckTrackerBgColor", if (UIWidgets::EnhancementColor("BG Color", "gCheckTrackerBgColor",
ImVec4(Color_Background.r / 255.0f, Color_Background.g / 255.0f, Color_Background.b / 255.0f, Color_Background.a / 255.0f), ImVec4(Color_Background.r, Color_Background.g, Color_Background.b, Color_Background.a),
ImVec4(Color_Bg_Default.r / 255.0f, Color_Bg_Default.g / 255.0f, Color_Bg_Default.b / 255.0f, Color_Bg_Default.a / 255.0f), ImVec4(Color_Bg_Default.r, Color_Bg_Default.g, Color_Bg_Default.b, Color_Bg_Default.a),
false, true)) false, true))
{ {
Color_Background = CVar_GetRGBA("gCheckTrackerBgColor", Color_Bg_Default); Color_Background = CVar_GetRGBA("gCheckTrackerBgColor", Color_Bg_Default);