diff --git a/pcsx2/Achievements.cpp b/pcsx2/Achievements.cpp index 624e8196bb..d2a59a0d63 100644 --- a/pcsx2/Achievements.cpp +++ b/pcsx2/Achievements.cpp @@ -459,9 +459,9 @@ bool Achievements::Initialize() SettingsInterface* secretsInterface = Host::Internal::GetSecretsSettingsLayer(); secretsInterface->SetStringValue("Achievements", "Token", oldToken.c_str()); secretsInterface->Save(); - + oldToken.clear(); - + auto baseLock = Host::GetSettingsLock(); SettingsInterface* baseInterface = Host::Internal::GetBaseSettingsLayer(); baseInterface->DeleteValue("Achievements", "Token"); @@ -544,7 +544,7 @@ void Achievements::UpdateNotificationPosition() { // Set notification position based on achievement settings float horizontal_position, vertical_position, direction; - + // Determine horizontal alignment switch (EmuConfig.Achievements.NotificationPosition) { @@ -553,13 +553,13 @@ void Achievements::UpdateNotificationPosition() case OsdOverlayPos::BottomLeft: horizontal_position = 0.0f; // Left break; - + case OsdOverlayPos::TopCenter: case OsdOverlayPos::Center: case OsdOverlayPos::BottomCenter: horizontal_position = 0.5f; // Center break; - + case OsdOverlayPos::TopRight: case OsdOverlayPos::CenterRight: case OsdOverlayPos::BottomRight: @@ -567,7 +567,7 @@ void Achievements::UpdateNotificationPosition() horizontal_position = 1.0f; // Right break; } - + // Determine vertical alignment and stacking direction switch (EmuConfig.Achievements.NotificationPosition) { @@ -577,14 +577,14 @@ void Achievements::UpdateNotificationPosition() vertical_position = 0.15f; // Top area direction = 1.0f; // Stack downward break; - + case OsdOverlayPos::CenterLeft: case OsdOverlayPos::Center: case OsdOverlayPos::CenterRight: vertical_position = 0.5f; // Center direction = 1.0f; // Stack downward break; - + case OsdOverlayPos::BottomLeft: case OsdOverlayPos::BottomCenter: case OsdOverlayPos::BottomRight: @@ -593,7 +593,7 @@ void Achievements::UpdateNotificationPosition() direction = -1.0f; // Stack upward break; } - + ImGuiFullscreen::SetNotificationPosition(horizontal_position, vertical_position, direction); } @@ -1849,7 +1849,7 @@ void Achievements::ClientLoginWithPasswordCallback(int result, const char* error Host::SetBaseStringSettingValue("Achievements", "Username", params->username); Host::SetBaseStringSettingValue("Achievements", "LoginTimestamp", fmt::format("{}", std::time(nullptr)).c_str()); Host::CommitBaseSettingChanges(); - + SettingsInterface* secretsInterface = Host::Internal::GetSecretsSettingsLayer(); secretsInterface->SetStringValue("Achievements", "Token", user->token); secretsInterface->Save(); @@ -2048,7 +2048,7 @@ static ImVec2 CalculateOverlayPosition(const ImGuiIO& io, float padding, Achieve static ImVec2 AdjustPositionForAlignment(const ImVec2& base_position, const ImVec2& element_size, AchievementOverlayPosition alignment) { ImVec2 adjusted = base_position; - + // Adjust for horizontal alignment switch (alignment) { @@ -2057,14 +2057,14 @@ static ImVec2 AdjustPositionForAlignment(const ImVec2& base_position, const ImVe case AchievementOverlayPosition::BottomLeft: // Left aligned no adjustment needed for x break; - + case AchievementOverlayPosition::TopCenter: case AchievementOverlayPosition::Center: case AchievementOverlayPosition::BottomCenter: // Center aligned offset by half element width adjusted.x -= element_size.x * 0.5f; break; - + case AchievementOverlayPosition::TopRight: case AchievementOverlayPosition::CenterRight: case AchievementOverlayPosition::BottomRight: @@ -2073,7 +2073,7 @@ static ImVec2 AdjustPositionForAlignment(const ImVec2& base_position, const ImVe adjusted.x -= element_size.x; break; } - + // Adjust for vertical alignment switch (alignment) { @@ -2082,14 +2082,14 @@ static ImVec2 AdjustPositionForAlignment(const ImVec2& base_position, const ImVe case AchievementOverlayPosition::TopRight: // Top aligned no adjustment needed for y break; - + case AchievementOverlayPosition::CenterLeft: case AchievementOverlayPosition::Center: case AchievementOverlayPosition::CenterRight: // Center aligned offset by half element height adjusted.y -= element_size.y * 0.5f; break; - + case AchievementOverlayPosition::BottomLeft: case AchievementOverlayPosition::BottomCenter: case AchievementOverlayPosition::BottomRight: @@ -2098,7 +2098,7 @@ static ImVec2 AdjustPositionForAlignment(const ImVec2& base_position, const ImVe adjusted.y -= element_size.y; break; } - + return adjusted; } @@ -2110,19 +2110,19 @@ static ImVec2 GetStackingDirection(AchievementOverlayPosition alignment) case AchievementOverlayPosition::TopCenter: case AchievementOverlayPosition::TopRight: return ImVec2(0.0f, 1.0f); // Stack downward - + case AchievementOverlayPosition::BottomLeft: case AchievementOverlayPosition::BottomCenter: case AchievementOverlayPosition::BottomRight: default: return ImVec2(0.0f, -1.0f); // Stack upward - + case AchievementOverlayPosition::CenterLeft: return ImVec2(1.0f, 0.0f); // Stack rightward - + case AchievementOverlayPosition::CenterRight: return ImVec2(-1.0f, 0.0f); // Stack leftward - + case AchievementOverlayPosition::Center: return ImVec2(0.0f, -1.0f); // Stack upward for center } @@ -2163,7 +2163,7 @@ void Achievements::DrawGameOverlays() { dl->AddImage(reinterpret_cast(badge->GetNativeHandle()), current_position, current_position + image_size, ImVec2(0.0f, 0.0f), ImVec2(1.0f, 1.0f), col); - + // For horizontal layouts, go horizontally for vertical layouts, stay in the same row if (std::abs(stack_direction.x) > 0.0f) { @@ -2214,7 +2214,7 @@ void Achievements::DrawGameOverlays() const ImVec2 progress_box_size = ImVec2(image_size.x + text_size.x + spacing + padding * 2.0f, image_size.y + padding * 2.0f); const ImVec2 stack_direction = GetStackingDirection(EmuConfig.Achievements.OverlayPosition); const ImVec2 box_position = AdjustPositionForAlignment(position, progress_box_size, EmuConfig.Achievements.OverlayPosition); - + const ImVec2 box_min = box_position; const ImVec2 box_max = box_position + progress_box_size; const float box_rounding = LayoutScale(1.0f); @@ -2248,7 +2248,7 @@ void Achievements::DrawGameOverlays() if (!s_active_leaderboard_trackers.empty() && EmuConfig.Achievements.LBOverlays) { const ImVec2 stack_direction = GetStackingDirection(EmuConfig.Achievements.OverlayPosition); - + for (auto it = s_active_leaderboard_trackers.begin(); it != s_active_leaderboard_trackers.end();) { const LeaderboardTrackerIndicator& indicator = *it; @@ -2263,7 +2263,7 @@ void Achievements::DrawGameOverlays() const ImVec2 tracker_box_size = ImVec2(size.x + padding * 2.0f, size.y + padding * 2.0f); const ImVec2 box_position = AdjustPositionForAlignment(position, tracker_box_size, EmuConfig.Achievements.OverlayPosition); - + const ImVec2 box_min = box_position; const ImVec2 box_max = box_position + tracker_box_size; const float box_rounding = LayoutScale(1.0f);