Fix two OSD rendering bugs (messages with text2 didn't render it, tex…

…t alignment with icon)
hrydgard · Jun 27, 2023 · 27847ab · 27847ab
1 parent aefedb1
commit 27847ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Common/System/System.h b/Common/System/System.h
@@ -238,7 +238,7 @@ class OnScreenDisplay {
 		Show(type, text, "", duration_s, id);
 	}
 	void Show(OSDType type, const std::string &text, const std::string &text2, float duration_s = 0.0f, const char *id = nullptr) {
-		Show(type, text, "", "", duration_s, id);
+		Show(type, text, text2, "", duration_s, id);
 	}
 	void Show(OSDType type, const std::string &text, const std::string &text2, const std::string &icon, float duration_s = 0.0f, const char *id = nullptr);
 	void ShowAchievementUnlocked(int achievementID);

diff --git a/UI/OnScreenDisplay.cpp b/UI/OnScreenDisplay.cpp
@@ -117,6 +117,7 @@ static void RenderOSDEntry(UIContext &dc, const OnScreenDisplay::Entry &entry, B
 	} else if (iconID.isValid()) {
 		// Atlas icon.
 		dc.DrawImageVGradient(iconID, foreGround, foreGround, Bounds(bounds.x + 2.5f, bounds.y + 2.5f, g_atlasIconSize, g_atlasIconSize));
+		iconSize = g_atlasIconSize;
 	}
 
 	// Make room