starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-04 05:04:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

FullscreenUI: Avoid redundant transition

Browse Source
This commit is contained in:
Stenzek
2026-01-07 14:23:04 +10:00
parent f989a80541
commit 5b5b6bbf77
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/fullscreenui_settings.cpp
View File

@@ -2226,9 +2226,13 @@ void FullscreenUI::DrawInterfaceSettingsPage()
FSUI_VSTR("Plays sound effects when navigating and activating menus."),
"Main", "FullscreenUISoundEffects", true);
// use transition to work around double lock
// have to queue because we're holding the settings lock, and UpdateWidgetsSettings() reads it
if (widgets_settings_changed)
BeginTransition(0.0f, &FullscreenUI::UpdateWidgetsSettings);
{
Host::RunOnCoreThread([]() {
GPUThread::RunOnThread(&FullscreenUI::UpdateWidgetsSettings);
});
}
MenuHeading(FSUI_VSTR("Behavior"));

3
src/core/fullscreenui_widgets.cpp
View File

@@ -1597,13 +1597,13 @@ void FullscreenUI::DrawFullscreenFooter()
if (prev_opacity < 1.0f)
{
const float opacity = 1.0f - prev_opacity;
if (!s_state.fullscreen_footer_text.empty())
{
const ImVec2 text_size =
font->CalcTextSizeA(font_size, font_weight, max_width, 0.0f, IMSTR_START_END(s_state.fullscreen_footer_text));
const ImVec2 text_pos =
ImVec2(io.DisplaySize.x - padding * 2.0f - text_size.x, io.DisplaySize.y - font_size - padding);
const float opacity = 1.0f - prev_opacity;
dl->AddText(font, font_size, font_weight, text_pos + shadow_offset, MulAlpha(UIStyle.ShadowColor, opacity),
IMSTR_START_END(s_state.fullscreen_footer_text));
dl->AddText(font, font_size, font_weight, text_pos, ModAlpha(text_color, opacity),
@@ -1613,7 +1613,6 @@ void FullscreenUI::DrawFullscreenFooter()
if (!s_state.left_fullscreen_footer_text.empty())
{
const ImVec2 text_pos = ImVec2(padding, io.DisplaySize.y - font_size - padding);
const float opacity = 1.0f - prev_opacity;
dl->AddText(font, font_size, font_weight, text_pos + shadow_offset, MulAlpha(UIStyle.ShadowColor, opacity),
IMSTR_START_END(s_state.left_fullscreen_footer_text));
dl->AddText(font, font_size, font_weight, text_pos, ModAlpha(text_color, opacity),