otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix StyleVar stack mismatch 2

Browse source
This commit is contained in:
Natt Akuma 2023-11-02 01:34:01 +07:00
parent b812a90637
commit 2e9cfd059a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gui/xyOsc.cpp
View file

@ -31,7 +31,8 @@ void FurnaceGUI::drawXYOsc() {
} }
if (!xyOscOpen) return; if (!xyOscOpen) return;
ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(canvasW,canvasH)); ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(canvasW,canvasH));
if (settings.oscTakesEntireWindow && !xyOscOptions) { bool noPadding=settings.oscTakesEntireWindow && !xyOscOptions;
if (noPadding) {
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,ImVec2(0,0)); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,ImVec2(0,0));
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing,ImVec2(0,0)); ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing,ImVec2(0,0));
ImGui::PushStyleVar(ImGuiStyleVar_ItemInnerSpacing,ImVec2(0,0)); ImGui::PushStyleVar(ImGuiStyleVar_ItemInnerSpacing,ImVec2(0,0));
@ -223,7 +224,7 @@ void FurnaceGUI::drawXYOsc() {
} }
} }
} }
if (settings.oscTakesEntireWindow && !xyOscOptions) { if (noPadding) {
ImGui::PopStyleVar(3); ImGui::PopStyleVar(3);
} }
if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_XY_OSC; if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_XY_OSC;