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: Fix crash when hovering floating buttons

Browse Source 
Only used in achievement lists.

Regression from db46413df7.
This commit is contained in:
Stenzek
2026-01-16 00:46:03 +10:00
parent 56fc9afbcf
commit 80993e9880
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/fullscreenui_widgets.cpp
View File

@@ -78,6 +78,7 @@ static void BeginMenuButtonDrawSplit();
static void EndMenuButtonDrawSplit();
static void SetMenuButtonSplitLayer(int layer);
static void DrawMenuButtonFrameAt(const ImVec2& frame_min, const ImVec2& frame_max, u32 col, bool border);
static void DrawMenuButtonFrameAtOnCurrentLayer(const ImVec2& frame_min, const ImVec2& frame_max, u32 col, bool border);
static void PostDrawMenuButtonFrame();
static void DrawBackgroundProgressDialogs(float& current_y);
@@ -1829,6 +1830,14 @@ void FullscreenUI::DrawMenuButtonFrameAt(const ImVec2& frame_min, const ImVec2&
{
SetMenuButtonSplitLayer(MENU_BUTTON_SPLIT_LAYER_HIGHLIGHT);
DrawMenuButtonFrameAtOnCurrentLayer(frame_min, frame_max, col, border);
SetMenuButtonSplitLayer(MENU_BUTTON_SPLIT_LAYER_FOREGROUND);
}
void FullscreenUI::DrawMenuButtonFrameAtOnCurrentLayer(const ImVec2& frame_min, const ImVec2& frame_max, u32 col,
bool border)
{
const float rounding = LayoutScale(LAYOUT_MENU_ITEM_BORDER_ROUNDING);
if (border && UIStyle.MenuBorders)
{
@@ -1841,8 +1850,6 @@ void FullscreenUI::DrawMenuButtonFrameAt(const ImVec2& frame_min, const ImVec2&
{
ImGui::RenderFrame(frame_min, frame_max, col, false, rounding);
}
SetMenuButtonSplitLayer(MENU_BUTTON_SPLIT_LAYER_FOREGROUND);
}
void FullscreenUI::PostDrawMenuButtonFrame()
@@ -2477,7 +2484,10 @@ bool FullscreenUI::FloatingButton(std::string_view text, float x, float y, float
{
pressed = ImGui::ButtonBehavior(bb, id, &hovered, &held);
if (hovered)
DrawMenuButtonFrame(bb.Min, bb.Max, held);
{
const ImU32 col = ImGui::GetColorU32(held ? ImGuiCol_ButtonActive : ImGuiCol_ButtonHovered);
DrawMenuButtonFrameAtOnCurrentLayer(bb.Min, bb.Max, col, true);
}
}
else
{