Skip to content

Commit bdba1af

Browse files
committed
fix: Fix bottom nav bar links not working on uninstall panel
1 parent 1bc7775 commit bdba1af

File tree

4 files changed

+23
-74
lines changed

4 files changed

+23
-74
lines changed

docs/CHANGELOG.md

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,55 @@
11
## [1.1.1](https://github.com/SteamClientHomebrew/Installer/compare/v1.1.0...v1.1.1) (2025-06-26)
22

3-
43
### Bug Fixes
54

6-
* more verbose opengl error message ([5469092](https://github.com/SteamClientHomebrew/Installer/commit/5469092d6d24abfd2c1f7ba138ed26cdce95144a))
5+
- more verbose opengl error message ([5469092](https://github.com/SteamClientHomebrew/Installer/commit/5469092d6d24abfd2c1f7ba138ed26cdce95144a))
76

87
# [1.1.0](https://github.com/SteamClientHomebrew/Installer/compare/v1.0.5...v1.1.0) (2025-06-26)
98

10-
119
### Bug Fixes
1210

13-
* update vcpkg baseline ([8aed3ed](https://github.com/SteamClientHomebrew/Installer/commit/8aed3edc663eb5e0fb78be2a4640b8d3b3be9328))
14-
11+
- update vcpkg baseline ([8aed3ed](https://github.com/SteamClientHomebrew/Installer/commit/8aed3edc663eb5e0fb78be2a4640b8d3b3be9328))
1512

1613
### Features
1714

18-
* Simplify installer modal, and improve GLFW error handling. ([45d7740](https://github.com/SteamClientHomebrew/Installer/commit/45d77406e36025e409e5025aaa942fe54428d4fb))
19-
20-
## [1.0.5](https://github.com/shdwmtr/starlight/compare/v1.0.4...v1.0.5) (2025-04-05)
15+
- Simplify installer modal, and improve GLFW error handling. ([45d7740](https://github.com/SteamClientHomebrew/Installer/commit/45d77406e36025e409e5025aaa942fe54428d4fb))
2116

17+
## [1.0.5](https://github.com/SteamClientHomebrew/Installer/compare/v1.0.4...v1.0.5) (2025-04-05)
2218

2319
### Bug Fixes
2420

25-
* Fix timer resolution for higher refresh rate monitors ([ac4baaa](https://github.com/shdwmtr/starlight/commit/ac4baaa0f3e9c0936313eff11d31ccb5e040f17d))
26-
27-
## [1.0.4](https://github.com/shdwmtr/starlight/compare/v1.0.3...v1.0.4) (2025-04-03)
21+
- Fix timer resolution for higher refresh rate monitors ([ac4baaa](https://github.com/SteamClientHomebrew/Installer/commit/ac4baaa0f3e9c0936313eff11d31ccb5e040f17d))
2822

23+
## [1.0.4](https://github.com/SteamClientHomebrew/Installer/compare/v1.0.3...v1.0.4) (2025-04-03)
2924

3025
### Bug Fixes
3126

32-
* Reduce CPU usage. ([9f03175](https://github.com/shdwmtr/starlight/commit/9f031757221e3e41478ed555d77190e9139259ab))
33-
34-
## [1.0.3](https://github.com/shdwmtr/starlight/compare/v1.0.2...v1.0.3) (2025-04-03)
27+
- Reduce CPU usage. ([9f03175](https://github.com/SteamClientHomebrew/Installer/commit/9f031757221e3e41478ed555d77190e9139259ab))
3528

29+
## [1.0.3](https://github.com/SteamClientHomebrew/Installer/compare/v1.0.2...v1.0.3) (2025-04-03)
3630

3731
### Bug Fixes
3832

39-
* Stop the developer console from allocating ([9b0f6f3](https://github.com/shdwmtr/starlight/commit/9b0f6f38f6b9ff2c4f0de28ce7ea448343d9711e))
40-
41-
## [1.0.2](https://github.com/shdwmtr/starlight/compare/v1.0.1...v1.0.2) (2025-04-03)
33+
- Stop the developer console from allocating ([9b0f6f3](https://github.com/SteamClientHomebrew/Installer/commit/9b0f6f38f6b9ff2c4f0de28ce7ea448343d9711e))
4234

35+
## [1.0.2](https://github.com/SteamClientHomebrew/Installer/compare/v1.0.1...v1.0.2) (2025-04-03)
4336

4437
### Bug Fixes
4538

46-
* Actually fix build ([bc827e8](https://github.com/shdwmtr/starlight/commit/bc827e8f799fc7af60ae9a2cad1d590ef177b4f6))
47-
48-
## [1.0.1](https://github.com/shdwmtr/starlight/compare/v1.0.0...v1.0.1) (2025-04-03)
39+
- Actually fix build ([bc827e8](https://github.com/SteamClientHomebrew/Installer/commit/bc827e8f799fc7af60ae9a2cad1d590ef177b4f6))
4940

41+
## [1.0.1](https://github.com/SteamClientHomebrew/Installer/compare/v1.0.0...v1.0.1) (2025-04-03)
5042

5143
### Bug Fixes
5244

53-
* Fix build ([9d85eae](https://github.com/shdwmtr/starlight/commit/9d85eae0e1db824192c0ae63946969e79d0ce1fa))
45+
- Fix build ([9d85eae](https://github.com/SteamClientHomebrew/Installer/commit/9d85eae0e1db824192c0ae63946969e79d0ce1fa))
5446

5547
# 1.0.0 (2025-04-03)
5648

57-
5849
### Features
5950

60-
* Add semantic release ([0c48117](https://github.com/shdwmtr/starlight/commit/0c48117742c89b3fbc9170d53f261225ea0f6ec8))
61-
* Bug fixes ([3112a60](https://github.com/shdwmtr/starlight/commit/3112a60aed397ed075532386816661510ce974f5))
62-
* Finish implementation. ([bc4a638](https://github.com/shdwmtr/starlight/commit/bc4a63848d9218cd84270623222e24f1e764851a))
63-
* Further installer implementation. ([8f74820](https://github.com/shdwmtr/starlight/commit/8f74820446d6148688db4e26786b6c9dc75e6fe0))
64-
* Rewrite in ImGui ([a492ee0](https://github.com/shdwmtr/starlight/commit/a492ee064abff23acbfa419ebc89efc2d6c68299))
51+
- Add semantic release ([0c48117](https://github.com/SteamClientHomebrew/Installer/commit/0c48117742c89b3fbc9170d53f261225ea0f6ec8))
52+
- Bug fixes ([3112a60](https://github.com/SteamClientHomebrew/Installer/commit/3112a60aed397ed075532386816661510ce974f5))
53+
- Finish implementation. ([bc4a638](https://github.com/SteamClientHomebrew/Installer/commit/bc4a63848d9218cd84270623222e24f1e764851a))
54+
- Further installer implementation. ([8f74820](https://github.com/SteamClientHomebrew/Installer/commit/8f74820446d6148688db4e26786b6c9dc75e6fe0))
55+
- Rewrite in ImGui ([a492ee0](https://github.com/SteamClientHomebrew/Installer/commit/a492ee064abff23acbfa419ebc89efc2d6c68299))

src/components/bottombar.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
using namespace ImGui;
4444

4545
constexpr const char* discordInviteLink = "https://steambrew.app/discord";
46-
constexpr const char* githubRepositoryUrl = "https://github.com/shdwmtr/millennium";
46+
constexpr const char* githubRepositoryUrl = "https://github.com/SteamClientHomebrew/Millennium";
4747

4848
const void RenderBottomNavBar(const char* identifier, float xPos, std::function<void()> buttonRenderCallback)
4949
{

src/routes/install_prompt.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ nlohmann::json releaseInfo, osReleaseInfo;
6161

6262
const bool FetchVersionInfo()
6363
{
64-
const auto response = Http::Get("https://api.github.com/repos/shdwmtr/millennium/releases", false);
64+
const auto response = Http::Get("https://api.github.com/repos/SteamClientHomebrew/Millennium/releases", false);
6565

6666
if (response.empty())
6767
{

src/routes/uninstall_select.cc

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -332,52 +332,14 @@ const void RenderUninstallSelect(std::shared_ptr<RouterNav> router, float xPos)
332332
EndChild();
333333
PopStyleColor();
334334

335-
SetCursorPos({ xPos, viewport->Size.y - BottomNavBarHeight + 1 });
336-
337-
PushStyleVar (ImGuiStyleVar_WindowPadding, ImVec2(ScaleX(30), ScaleY(30)));
338-
PushStyleColor(ImGuiCol_Border, ImVec4(0.f, 0.f, 0.f, 0.f));
339-
PushStyleVar (ImGuiStyleVar_ChildRounding, 0.0f);
340-
PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.078f, 0.082f, 0.09f, 1.0f));
341-
342-
BeginChild("##BottomNavBar", ImVec2(viewport->Size.x, BottomNavBarHeight), true, ImGuiWindowFlags_NoScrollbar);
335+
RenderBottomNavBar("InstallPrompt", xPos, [router, xPos]
343336
{
344-
SetCursorPos({ ScaleX(45), GetCursorPosY() + ScaleY(12.5) });
345-
Image((ImTextureID)(intptr_t)infoIconTexture, ImVec2(ScaleX(25), ScaleY(25)));
346-
347-
SameLine(0, ScaleX(42));
348-
const float cursorPosSave = GetCursorPosX();
349-
350-
SetCursorPosY(GetCursorPosY() - ScaleX(12));
351-
TextColored(ImVec4(0.322f, 0.325f, 0.341f, 1.0f), "Steam Homebrew & Millennium are not affiliated with");
352-
353-
SetCursorPos({ cursorPosSave, GetCursorPosY() - ScaleY(20) });
354-
TextColored(ImVec4(0.322f, 0.325f, 0.341f, 1.0f), "Steam®, Valve, or any of their partners.");
355-
356-
SameLine(0);
357-
SetCursorPosY(GetCursorPosY() - ScaleY(25));
358-
359337
static bool isButtonHovered = false;
360338
float currentColor = EaseInOutFloat("##NextButton", 1.0f, 0.8f, isButtonHovered, 0.3f);
361339

362340
PushStyleColor(ImGuiCol_Button, ImVec4(currentColor, currentColor, currentColor, 1.0f));
363341
PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(currentColor, currentColor, currentColor, 1.0f));
364342
PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.8f, 0.8f, 0.8f, 1.0f));
365-
PushStyleColor(ImGuiCol_Text, ImVec4(0.0f, 0.0f, 0.0f, 1.0f));
366-
367-
const int FooterContainerWidth = ScaleX(300);
368-
const float buttonPos = GetCursorPosY();
369-
370-
SetCursorPosX(xPos + GetCursorPosX() + GetContentRegionAvail().x - FooterContainerWidth);
371-
SetCursorPosY(GetCursorPosY() + ScaleY(10));
372-
373-
Image((ImTextureID)(intptr_t)discordIconTexture, ImVec2(ScaleX(30), ScaleY(30)));
374-
SameLine(0, ScaleX(25));
375-
SetCursorPosY(GetCursorPosY() - ScaleY(15));
376-
377-
Image((ImTextureID)(intptr_t)gtihubIconTexture, ImVec2(ScaleX(30), ScaleY(30)));
378-
SameLine(0, ScaleX(25));
379-
380-
SetCursorPosY(buttonPos);
381343

382344
if (uninstallFinished)
383345
{
@@ -407,11 +369,7 @@ const void RenderUninstallSelect(std::shared_ptr<RouterNav> router, float xPos)
407369
SetMouseCursor(ImGuiMouseCursor_Hand);
408370
}
409371

410-
PopStyleColor(4);
372+
PopStyleColor(3);
411373
isButtonHovered = IsItemHovered() || (IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) && IsMouseDown(ImGuiMouseButton_Left));
412-
}
413-
EndChild();
414-
415-
PopStyleVar(2);
416-
PopStyleColor(2);
374+
});
417375
}

0 commit comments

Comments
 (0)