diff --git a/Common/System/OSD.h b/Common/System/OSD.h index 6432cca01c..823236469d 100644 --- a/Common/System/OSD.h +++ b/Common/System/OSD.h @@ -19,6 +19,7 @@ enum class OSDType { // Side entries ACHIEVEMENT_PROGRESS, // Achievement icon + "measured_progress" text, auto-hide after 2s ACHIEVEMENT_CHALLENGE_INDICATOR, // Achievement icon ONLY, no auto-hide + LEADERBOARD_TRACKER, }; diff --git a/UI/OnScreenDisplay.cpp b/UI/OnScreenDisplay.cpp index 7d5b2a0ee0..a8bc84c441 100644 --- a/UI/OnScreenDisplay.cpp +++ b/UI/OnScreenDisplay.cpp @@ -202,7 +202,7 @@ static void RenderOSDProgressBar(UIContext &dc, const OnScreenDisplay::ProgressB static void MeasureLeaderboardTracker(UIContext &dc, const std::string &text, float *width, float *height) { dc.MeasureText(dc.GetFontStyle(), 1.0f, 1.0f, text.c_str(), width, height); - *width += 10.0f; + *width += 16.0f; *height += 10.0f; } @@ -214,7 +214,7 @@ static void RenderLeaderboardTracker(UIContext &dc, const Bounds &bounds, const dc.FillRect(background, bounds); dc.SetFontStyle(dc.theme->uiFont); dc.SetFontScale(1.0f, 1.0f); - dc.DrawTextShadowRect(text.c_str(), bounds.Inset(5.0f, 5.0f), colorAlpha(0xFFFFFFFF, alpha), ALIGN_VCENTER | ALIGN_LEFT); + dc.DrawTextShadowRect(text.c_str(), bounds.Inset(5.0f, 5.0f), colorAlpha(0xFFFFFFFF, alpha), ALIGN_VCENTER | ALIGN_HCENTER); } void OnScreenMessagesView::Draw(UIContext &dc) { diff --git a/assets/ui_atlas.meta b/assets/ui_atlas.meta index f2df6bfd1d..b969735e1c 100644 Binary files a/assets/ui_atlas.meta and b/assets/ui_atlas.meta differ diff --git a/assets/ui_atlas.zim b/assets/ui_atlas.zim index 3ab85b7e22..d47766ad49 100644 Binary files a/assets/ui_atlas.zim and b/assets/ui_atlas.zim differ diff --git a/source_assets/image/buttons.svg b/source_assets/image/buttons.svg index a335acacfb..b6bf625d11 100644 --- a/source_assets/image/buttons.svg +++ b/source_assets/image/buttons.svg @@ -1688,10 +1688,10 @@ id="filter5096-3" style="color-interpolation-filters:sRGB" inkscape:label="Drop Shadow" - x="-0.065" - y="-0.065" - width="1.13" - height="1.13"> + x="-0.17000000000000001" + y="-0.13999999999999999" + width="1.3600000000000001" + height="1.28"> + inkscape:label="Drop Shadow" + width="1.7200000000000004" + height="1.2" + x="-0.23000000000000009" + y="-0.10000000000000001"> + + + + + + + + + + + + + + + + + + + + + + x="-3.2951229" + y="-3.9247968" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source_assets/image/fast_forward.png b/source_assets/image/fast_forward.png new file mode 100644 index 0000000000..d7fb6ae6b4 Binary files /dev/null and b/source_assets/image/fast_forward.png differ diff --git a/source_assets/image/pausepng.png b/source_assets/image/pausepng.png new file mode 100644 index 0000000000..b618a7ffd9 Binary files /dev/null and b/source_assets/image/pausepng.png differ diff --git a/source_assets/image/play.png b/source_assets/image/play.png new file mode 100644 index 0000000000..d324c25b84 Binary files /dev/null and b/source_assets/image/play.png differ diff --git a/source_assets/image/record.png b/source_assets/image/record.png new file mode 100644 index 0000000000..05008ad253 Binary files /dev/null and b/source_assets/image/record.png differ diff --git a/source_assets/image/speaker.png b/source_assets/image/speaker.png new file mode 100644 index 0000000000..b043e5e631 Binary files /dev/null and b/source_assets/image/speaker.png differ diff --git a/source_assets/image/speaker_max.png b/source_assets/image/speaker_max.png new file mode 100644 index 0000000000..8625b2b2ee Binary files /dev/null and b/source_assets/image/speaker_max.png differ diff --git a/source_assets/image/speaker_off.png b/source_assets/image/speaker_off.png new file mode 100644 index 0000000000..b8b1e8e2bb Binary files /dev/null and b/source_assets/image/speaker_off.png differ diff --git a/source_assets/image/stop.png b/source_assets/image/stop.png new file mode 100644 index 0000000000..3860c5b38b Binary files /dev/null and b/source_assets/image/stop.png differ diff --git a/source_assets/image/winner_cup.png b/source_assets/image/winner_cup.png new file mode 100644 index 0000000000..27ba1ed945 Binary files /dev/null and b/source_assets/image/winner_cup.png differ diff --git a/ui_atlasscript.txt b/ui_atlasscript.txt index c2f633f3ad..62a8037c7a 100644 --- a/ui_atlasscript.txt +++ b/ui_atlasscript.txt @@ -72,3 +72,11 @@ image I_THREE_DOTS source_assets/image/three_dots.png copy image I_INFO source_assets/image/info.png copy image I_RETROACHIEVEMENTS_LOGO source_assets/image/retroachievements_logo.png copy image I_CHECKMARK source_assets/image/checkmark.png copy +image I_PLAY source_assets/image/play.png copy +image I_STOP source_assets/image/stop.png copy +image I_FASTFORWARD source_assets/image/fast_forward.png copy +image I_RECORD source_assets/image/record.png copy +image I_SPEAKER source_assets/image/speaker.png copy +image I_SPEAKER_MAX source_assets/image/speaker_max.png copy +image I_SPEAKER_OFF source_assets/image/speaker_off.png copy +image I_WINNER_CUP source_assets/image/winner_cup.png copy