Merge pull request #1627 from LTVA1/fix-XY-oscilloscope-size
Fix default XY oscilloscope size
This commit is contained in:
commit
1a96450077
|
@ -1036,6 +1036,11 @@ Pos=60,60\n\
|
|||
Size=145,184\n\
|
||||
Collapsed=0\n\
|
||||
\n\
|
||||
[Window][Oscilloscope (X-Y)]\n\
|
||||
Pos=60,60\n\
|
||||
Size=300,300\n\
|
||||
Collapsed=0\n\
|
||||
\n\
|
||||
[Docking][Data]\n\
|
||||
DockSpace ID=0x8B93E3BD Window=0xA787BDB4 Pos=0,24 Size=1280,776 Split=Y Selected=0x6C01C512\n\
|
||||
DockNode ID=0x00000001 Parent=0x8B93E3BD SizeRef=1280,217 Split=X Selected=0xF3094A52\n\
|
||||
|
|
|
@ -30,7 +30,7 @@ void FurnaceGUI::drawXYOsc() {
|
|||
nextWindow=GUI_WINDOW_NOTHING;
|
||||
}
|
||||
if (!xyOscOpen) return;
|
||||
ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(canvasW,canvasH));
|
||||
ImGui::SetNextWindowSizeConstraints(ImVec2(128.0f*dpiScale,128.0f*dpiScale),ImVec2(canvasW,canvasH));
|
||||
bool noPadding=settings.oscTakesEntireWindow && !xyOscOptions;
|
||||
if (noPadding) {
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,ImVec2(0,0));
|
||||
|
|
Loading…
Reference in a new issue