瀏覽代碼

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

ocornut 1 年之前
父節點
當前提交
3141d87ef8
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 0
      imgui_demo.cpp
  2. 1 1
      imgui_widgets.cpp

+ 1 - 0
imgui_demo.cpp

@@ -9737,6 +9737,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);

+ 1 - 1
imgui_widgets.cpp

@@ -7180,7 +7180,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)