diff --git a/imgui_demo.cpp b/imgui_demo.cpp index 9f8a80f8d..32e6e8f2f 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -9737,6 +9737,7 @@ struct ExampleAssetsBrowser ImGui::SeparatorText("Layout"); 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 Hit Spacing", &IconHitSpacing, 0, 32); ImGui::Checkbox("Stretch Spacing", &StretchSpacing); diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp index 4ca36d17e..f7be14160 100644 --- a/imgui_widgets.cpp +++ b/imgui_widgets.cpp @@ -7180,7 +7180,7 @@ bool ImGui::BeginBoxSelect(ImGuiWindow* window, ImGuiID box_select_id, ImGuiMult bs->Window = window; bs->IsStarting = false; 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; } else if ((bs->IsStarting || bs->IsActive) && g.IO.MouseDown[0] == false)