installer_wizard: decrease nav button margin

This commit is contained in:
Hyper 2025-02-05 18:33:26 +00:00
parent 7e5ee340fc
commit 3d3e06ad9a
2 changed files with 12 additions and 13 deletions

View file

@ -1,20 +1,19 @@
#pragma once #pragma once
inline const char* g_credits[] = inline std::array<const char*, 14> g_credits =
{ {
"Skyth", "Skyth",
"Hyper", "Hyper",
"Darío", "Darío",
"Sajid", "Sajid",
"DeaThProj",
"RadiantDerg", "RadiantDerg",
"PTKay", "PTKay",
"DeaThProj",
"SuperSonic16", "SuperSonic16",
"NextinHKRY", "NextinHKRY",
"M&M",
"saguinee", "saguinee",
"LadyLunanova", "LadyLunanova",
"LJSTAR" "LJSTAR",
"Goalringmod27",
"M&M"
}; };
inline size_t g_creditsSize = 12;

View file

@ -78,7 +78,7 @@ constexpr float CONTAINER_HEIGHT = 246.0f;
constexpr float SIDE_CONTAINER_WIDTH = CONTAINER_WIDTH / 2.0f; constexpr float SIDE_CONTAINER_WIDTH = CONTAINER_WIDTH / 2.0f;
constexpr float BOTTOM_X_GAP = 4.0f; constexpr float BOTTOM_X_GAP = 4.0f;
constexpr float BOTTOM_Y_GAP = 6.0f; constexpr float BOTTOM_Y_GAP = 5.0f;
constexpr float CONTAINER_BUTTON_WIDTH = 250.0f; constexpr float CONTAINER_BUTTON_WIDTH = 250.0f;
constexpr float CONTAINER_BUTTON_GAP = 9.0f; constexpr float CONTAINER_BUTTON_GAP = 9.0f;
constexpr float BUTTON_HEIGHT = 22.0f; constexpr float BUTTON_HEIGHT = 22.0f;
@ -1017,9 +1017,9 @@ static void DrawProgressBar(float progressRatio)
float alpha = 1.0; float alpha = 1.0;
const uint32_t innerColor0 = IM_COL32(0, 65, 0, 255 * alpha); const uint32_t innerColor0 = IM_COL32(0, 65, 0, 255 * alpha);
const uint32_t innerColor1 = IM_COL32(0, 32, 0, 255 * alpha); const uint32_t innerColor1 = IM_COL32(0, 32, 0, 255 * alpha);
float xPadding = Scale(6.0f); float xPadding = Scale(4);
float yPadding = Scale(3.0f); float yPadding = Scale(3);
ImVec2 min = { g_aspectRatioOffsetX + Scale(CONTAINER_X) + BOTTOM_X_GAP, g_aspectRatioOffsetY + Scale(CONTAINER_Y + CONTAINER_HEIGHT + BOTTOM_Y_GAP) }; ImVec2 min = { g_aspectRatioOffsetX + Scale(CONTAINER_X) + BOTTOM_X_GAP + Scale(1), g_aspectRatioOffsetY + Scale(CONTAINER_Y + CONTAINER_HEIGHT + BOTTOM_Y_GAP)};
ImVec2 max = { g_aspectRatioOffsetX + Scale(CONTAINER_X + CONTAINER_WIDTH - BOTTOM_X_GAP), g_aspectRatioOffsetY + Scale(CONTAINER_Y + CONTAINER_HEIGHT + BOTTOM_Y_GAP + BUTTON_HEIGHT) }; ImVec2 max = { g_aspectRatioOffsetX + Scale(CONTAINER_X + CONTAINER_WIDTH - BOTTOM_X_GAP), g_aspectRatioOffsetY + Scale(CONTAINER_Y + CONTAINER_HEIGHT + BOTTOM_Y_GAP + BUTTON_HEIGHT) };
DrawButtonContainer(min, max, 0, 0, alpha); DrawButtonContainer(min, max, 0, 0, alpha);
@ -1036,8 +1036,8 @@ static void DrawProgressBar(float progressRatio)
const uint32_t sliderColor0 = IM_COL32(57, 241, 0, 255 * alpha); const uint32_t sliderColor0 = IM_COL32(57, 241, 0, 255 * alpha);
const uint32_t sliderColor1 = IM_COL32(2, 106, 0, 255 * alpha); const uint32_t sliderColor1 = IM_COL32(2, 106, 0, 255 * alpha);
xPadding += Scale(1.0f); xPadding += Scale(1.5f);
yPadding += Scale(1.0f); yPadding += Scale(1.5f);
ImVec2 sliderMin = { min.x + xPadding, min.y + yPadding }; ImVec2 sliderMin = { min.x + xPadding, min.y + yPadding };
ImVec2 sliderMax = { max.x - xPadding, max.y - yPadding }; ImVec2 sliderMax = { max.x - xPadding, max.y - yPadding };
@ -1702,7 +1702,7 @@ void InstallerWizard::Init()
g_pulseInstall = LOAD_ZSTD_TEXTURE(g_pulse_install); g_pulseInstall = LOAD_ZSTD_TEXTURE(g_pulse_install);
g_upHedgeDev = LOAD_ZSTD_TEXTURE(g_hedgedev); g_upHedgeDev = LOAD_ZSTD_TEXTURE(g_hedgedev);
for (int i = 0; i < g_creditsSize; i++) for (int i = 0; i < g_credits.size(); i++)
{ {
g_creditsStr += g_credits[i]; g_creditsStr += g_credits[i];
g_creditsStr += " "; g_creditsStr += " ";