anulax
/
imgui-docking
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

RangeSelect/MultiSelect: Box-Select: Fixed CTRL+drag from void clearing items.

Browse Source
features/range_select
ocornut ago%!(EXTRA string=1 year)
parent 130714fba3
commit 7d1246e248
2 changed files with 2 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      imgui_demo.cpp
  2. 2
      imgui_widgets.cpp

1
imgui_demo.cpp
Unescape View File

@ -9591,6 +9591,7 @@ struct ExampleAssetsBrowser
ImGui::SeparatorText("Layout"); ImGui::SeparatorText("Layout");
ImGui::SliderFloat("Icon Size", &IconSize, 16.0f, 128.0f, "%.0f"); ImGui::SliderFloat("Icon Size", &IconSize, 16.0f, 128.0f, "%.0f");
ImGui::SameLine(); HelpMarker("Use CTRL+Wheel to zoom");
ImGui::SliderInt("Icon Spacing", &IconSpacing, 0, 32); ImGui::SliderInt("Icon Spacing", &IconSpacing, 0, 32);
ImGui::SliderInt("Icon Hit Spacing", &IconHitSpacing, 0, 32); ImGui::SliderInt("Icon Hit Spacing", &IconHitSpacing, 0, 32);
ImGui::Checkbox("Stretch Spacing", &StretchSpacing); ImGui::Checkbox("Stretch Spacing", &StretchSpacing);

2
imgui_widgets.cpp
Unescape View File

@ -7063,7 +7063,7 @@ bool ImGui::BeginBoxSelect(ImGuiWindow* window, ImGuiID box_select_id, ImGuiMult
bs->Window = window; bs->Window = window;
bs->IsStarting = false; bs->IsStarting = false;
SetActiveID(bs->ID, window); SetActiveID(bs->ID, window);
if (bs->IsStartedFromVoid && (bs->KeyMods & ImGuiMod_Shift) == 0) if (bs->IsStartedFromVoid && (bs->KeyMods & (ImGuiMod_Ctrl | ImGuiMod_Shift)) == 0)
bs->RequestClear = true; bs->RequestClear = true;
} }
else if ((bs->IsStarting || bs->IsActive) && g.IO.MouseDown[0] == false) else if ((bs->IsStarting || bs->IsActive) && g.IO.MouseDown[0] == false)

Write Preview
Loading…
Cancel
Save