Skip to content

Commit 3698150

Browse files
committed
Fullscreen UI: Save State/Settings Dialogs (Squash Merge)
commit 529bbd5 Author: pips3 <136136496+pips3@users.noreply.github.com> Date: Mon Jun 2 01:12:13 2025 +0100 Stash: Settings dialogss commit 0e97383 Author: pips3 <136136496+pips3@users.noreply.github.com> Date: Sun Jun 1 17:57:08 2025 +0100 Stash: Fix choice dialog, centre align title bar commit 9b47ef8 Author: pips3 <136136496+pips3@users.noreply.github.com> Date: Sun Jun 1 13:57:48 2025 +0100 Stash: Savestate selector done commit 49ab3b3 Author: pips3 <136136496+pips3@users.noreply.github.com> Date: Sun Jun 1 12:09:51 2025 +0100 Stash commit cc40361 Author: pips3 <136136496+pips3@users.noreply.github.com> Date: Wed May 28 00:34:29 2025 +0100 Stash: File Selector Finished commit 1df25bf Author: pips3 <136136496+pips3@users.noreply.github.com> Date: Fri May 23 01:06:29 2025 +0100 stash again move to laptop again commit e3c81e1 Author: pips3 <136136496+pips3@users.noreply.github.com> Date: Sun May 18 21:10:53 2025 +0100 stash back wip ignore commit 69b3517 Author: pips3 <136136496+pips3@users.noreply.github.com> Date: Sat May 17 13:20:37 2025 +0100 wip stash ignore switching to laptop
1 parent 98ceb26 commit 3698150

6 files changed

Lines changed: 568 additions & 242 deletions

File tree

3rdparty/imgui/src/imgui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5704,7 +5704,7 @@ void ImGui::Render()
57045704
}
57055705

57065706
// Draw modal/window whitening backgrounds
5707-
RenderDimmedBackgrounds();
5707+
// RenderDimmedBackgrounds();
57085708

57095709
// Add ImDrawList to render
57105710
ImGuiWindow* windows_to_render_top_most[2];

3rdparty/imgui/src/imgui_widgets.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -863,13 +863,13 @@ bool ImGui::CloseButton(ImGuiID id, const ImVec2& pos)
863863
// Render
864864
ImU32 bg_col = GetColorU32(held ? ImGuiCol_ButtonActive : ImGuiCol_ButtonHovered);
865865
if (hovered)
866-
window->DrawList->AddRectFilled(bb.Min, bb.Max, bg_col);
867-
RenderNavCursor(bb, id, ImGuiNavRenderCursorFlags_Compact);
866+
window->DrawList->AddRectFilled(bb.Min, bb.Max, bg_col, g.Style.FrameRounding);
867+
//RenderNavCursor(bb, id, ImGuiNavRenderCursorFlags_Compact);
868868
ImU32 cross_col = GetColorU32(ImGuiCol_Text);
869869
ImVec2 cross_center = bb.GetCenter() - ImVec2(0.5f, 0.5f);
870870
float cross_extent = g.FontSize * 0.5f * 0.7071f - 1.0f;
871-
window->DrawList->AddLine(cross_center + ImVec2(+cross_extent, +cross_extent), cross_center + ImVec2(-cross_extent, -cross_extent), cross_col, 1.0f);
872-
window->DrawList->AddLine(cross_center + ImVec2(+cross_extent, -cross_extent), cross_center + ImVec2(-cross_extent, +cross_extent), cross_col, 1.0f);
871+
window->DrawList->AddLine(cross_center + ImVec2(+cross_extent, +cross_extent), cross_center + ImVec2(-cross_extent, -cross_extent), cross_col, g.FontSize * 0.1);
872+
window->DrawList->AddLine(cross_center + ImVec2(+cross_extent, -cross_extent), cross_center + ImVec2(-cross_extent, +cross_extent), cross_col, g.FontSize * 0.1);
873873

874874
return pressed;
875875
}

0 commit comments

Comments
 (0)