mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-29 21:02:18 -05:00
Code Issues Projects Releases Wiki Activity

Batter space management

Browse Source 
Semi-responsive logic for small resolution
This commit is contained in:
PurpleHato 2022-06-11 14:32:35 +02:00 committed by Nicholas Estelami
parent e66c4751ea
commit f7bcbe3049
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libultraship/libultraship/SohImGuiImpl.cpp
View File

@ -684,14 +684,21 @@ namespace SohImGui {
} }
//ImGui::SameLine(); // Removing that one to gain some width spacing on the HUD editor //ImGui::SameLine(); // Removing that one to gain some width spacing on the HUD editor
ImGui::NewLine(); ImGui::NewLine();
ImGui::PushItemWidth(-FLT_MIN);
ResetColor(cvarName, &ColorRGBA, default_colors, has_alpha); ResetColor(cvarName, &ColorRGBA, default_colors, has_alpha);
ImGui::SameLine(); ImGui::SameLine();
RandomizeColor(cvarName, &ColorRGBA); RandomizeColor(cvarName, &ColorRGBA);
if (allow_rainbow) { if (allow_rainbow) {
//Not all draw support rainbow, like Navi.
ImGui::SameLine(); if (ImGui::GetWindowSize().x > 560) {
ImGui::SameLine();
}
else {
ImGui::NewLine();
}
RainbowColor(cvarName, &ColorRGBA); RainbowColor(cvarName, &ColorRGBA);
} }
ImGui::PopItemWidth();
} }
void DrawMainMenuAndCalculateGameSize(void) { void DrawMainMenuAndCalculateGameSize(void) {
@ -1202,11 +1209,13 @@ namespace SohImGui {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
// COLUMN 1.1 - HEARTS // COLUMN 1.1 - HEARTS
ImGui::PushItemWidth(-FLT_MIN);
EnhancementColor("Hearts inner", "gCCHeartsPrim", hearts_colors, ImVec4(255, 70, 50, 255)); EnhancementColor("Hearts inner", "gCCHeartsPrim", hearts_colors, ImVec4(255, 70, 50, 255));
Tooltip("Hearts inner color (red in original)\nAffect both Normal Hearts and the ones in Double Defense"); Tooltip("Hearts inner color (red in original)\nAffect both Normal Hearts and the ones in Double Defense");
ImGui::Separator(); ImGui::Separator();
EnhancementColor("Hearts double def", "gDDCCHeartsPrim", hearts_dd_colors, ImVec4(255, 255, 255, 255)); EnhancementColor("Hearts double def", "gDDCCHeartsPrim", hearts_dd_colors, ImVec4(255, 255, 255, 255));
Tooltip("Hearts outline color (white in original)\nAffect Double Defense outline only."); Tooltip("Hearts outline color (white in original)\nAffect Double Defense outline only.");
ImGui::PopItemWidth();
ImGui::Separator(); ImGui::Separator();
if (ImGui::BeginTable("tableMisc", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) { if (ImGui::BeginTable("tableMisc", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
ImGui::TableSetupColumn("Misc", ImGuiTableColumnFlags_WidthStretch, 600.0f); ImGui::TableSetupColumn("Misc", ImGuiTableColumnFlags_WidthStretch, 600.0f);
@ -1214,6 +1223,7 @@ namespace SohImGui {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
// COLUMN 1.2 - MISC // COLUMN 1.2 - MISC
ImGui::PushItemWidth(-FLT_MIN);
EnhancementColor("Minimap color", "gCCMinimapPrim", minimap_colors, ImVec4(0, 255, 255, 255)); EnhancementColor("Minimap color", "gCCMinimapPrim", minimap_colors, ImVec4(0, 255, 255, 255));
Tooltip("Affect the Dungeon and Overworld minimaps."); Tooltip("Affect the Dungeon and Overworld minimaps.");
ImGui::Separator(); ImGui::Separator();
@ -1222,11 +1232,12 @@ namespace SohImGui {
ImGui::Separator(); ImGui::Separator();
EnhancementColor("Small Keys icon color", "gCCKeysPrim", smolekey_colors, ImVec4(200, 230, 255, 255)); EnhancementColor("Small Keys icon color", "gCCKeysPrim", smolekey_colors, ImVec4(200, 230, 255, 255));
Tooltip("Affect the Small keys icon on interface\nGray by default."); Tooltip("Affect the Small keys icon on interface\nGray by default.");
ImGui::Separator(); ImGui::PopItemWidth();
ImGui::EndTable(); ImGui::EndTable();
} }
ImGui::TableNextColumn(); ImGui::TableNextColumn();
// COLUMN 2 - MAGIC BAR // COLUMN 2 - MAGIC BAR
ImGui::PushItemWidth(-FLT_MIN);
EnhancementColor("Magic bar borders", "gCCMagicBorderPrim", magic_border_colors, ImVec4(255, 255, 255, 255)); EnhancementColor("Magic bar borders", "gCCMagicBorderPrim", magic_border_colors, ImVec4(255, 255, 255, 255));
Tooltip("Affect the border of the magic bar when being used\nWhite flash in original game."); Tooltip("Affect the border of the magic bar when being used\nWhite flash in original game.");
ImGui::Separator(); ImGui::Separator();
@ -1236,8 +1247,10 @@ namespace SohImGui {
EnhancementColor("Magic bar being used", "gCCMagicUsePrim", magic_use_colors, ImVec4(250, 250, 0, 255)); EnhancementColor("Magic bar being used", "gCCMagicUsePrim", magic_use_colors, ImVec4(250, 250, 0, 255));
Tooltip("Affect the magic bar when being used\nYellow in original game."); Tooltip("Affect the magic bar when being used\nYellow in original game.");
ImGui::Separator(); ImGui::Separator();
ImGui::PopItemWidth();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
// COLUMN 3 - BUTTON // COLUMN 3 - BUTTON
ImGui::PushItemWidth(-FLT_MIN);
EnhancementColor("A Buttons", "gCCABtnPrim", a_btn_colors, ImVec4(90, 90, 255, 255)); EnhancementColor("A Buttons", "gCCABtnPrim", a_btn_colors, ImVec4(90, 90, 255, 255));
Tooltip("A Buttons colors (Green in original GameCube)\nAffect A buttons colors on interface, in shops, messages boxes, ocarina notes and inventory cursors."); Tooltip("A Buttons colors (Green in original GameCube)\nAffect A buttons colors on interface, in shops, messages boxes, ocarina notes and inventory cursors.");
ImGui::Separator(); ImGui::Separator();
@ -1250,7 +1263,7 @@ namespace SohImGui {
EnhancementColor("Start Buttons", "gCCStartBtnPrim", start_btn_colors, ImVec4(120, 120, 120, 255)); EnhancementColor("Start Buttons", "gCCStartBtnPrim", start_btn_colors, ImVec4(120, 120, 120, 255));
Tooltip("Start Button colors (gray in GameCube)\nAffect Start button colors in inventory"); Tooltip("Start Button colors (gray in GameCube)\nAffect Start button colors in inventory");
ImGui::Separator(); ImGui::Separator();
ImGui::PopItemWidth();
ImGui::EndTable(); ImGui::EndTable();
ImGui::EndTabItem(); ImGui::EndTabItem();
} }