mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-18 21:20:57 +00:00
Let Global shortcuts run while typing, except keys that edit text (#16558)
#16505 skipped every Global shortcut while ImGui had the keyboard, so Ctrl+S, Ctrl+R and the others did nothing while the cursor was in the text tool's box. Skip only the chords that edit text, and only while a text field (a wx text entry, a spin control, a web view, or an active ImGui InputText) has the focus. Skip every Global shortcut while an ImGui modal is open on the focused canvas. KeyChord::edits_text() defines the text-editing chords. The Global page of the shortcuts dialog no longer says these shortcuts apply while typing.
This commit is contained in:
1 parent
c1fb801ff3
commit
0f59cd5d05
11 files changed
+284
-25
No files matched your search
@@ -1,6 +1,7 @@
|
||||
// How ImGuiWrapper turns wx mouse events into ImGui input. ImGuiWrapper lives in libslic3r_gui; this is
|
||||
// the suite that links it. Same Windows include prologue as test_texture_color_palette.cpp (wx pulls in
|
||||
// <windows.h>; keep WIN32_LEAN_AND_MEAN / NOMINMAX ahead of it).
|
||||
// How ImGuiWrapper turns wx mouse events into ImGui input, and when it reports that ImGui owns a key.
|
||||
// ImGuiWrapper lives in libslic3r_gui; this is the suite that links it. Same Windows include prologue
|
||||
// as test_texture_color_palette.cpp (wx pulls in <windows.h>; keep WIN32_LEAN_AND_MEAN / NOMINMAX
|
||||
// ahead of it).
|
||||
#ifdef WIN32
|
||||
#ifndef WIN32_LEAN_AND_MEAN
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
@@ -17,12 +18,15 @@
|
||||
#include <catch2/matchers/catch_matchers_floating_point.hpp>
|
||||
|
||||
#include <imgui/imgui.h>
|
||||
#include <imgui/imgui_internal.h>
|
||||
#include <wx/event.h>
|
||||
|
||||
#include "slic3r/GUI/ImGuiWrapper.hpp"
|
||||
#include "slic3r/GUI/KeyChord.hpp"
|
||||
|
||||
using Catch::Matchers::WithinAbs;
|
||||
using Slic3r::GUI::ImGuiWrapper;
|
||||
using Slic3r::GUI::KeyChord;
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -41,6 +45,45 @@ float wheel_after(int rotation, wxMouseWheelAxis axis)
|
||||
return ImGui::GetIO().MouseWheel;
|
||||
}
|
||||
|
||||
// Runs ImGui frames without OpenGL by building the font atlas on the CPU.
|
||||
struct ImGuiFrames
|
||||
{
|
||||
ImGuiWrapper imgui;
|
||||
|
||||
ImGuiFrames()
|
||||
{
|
||||
imgui.set_display_size(800.f, 600.f);
|
||||
unsigned char* pixels = nullptr;
|
||||
int width = 0, height = 0;
|
||||
ImGui::GetIO().Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);
|
||||
}
|
||||
|
||||
template<class Draw> void frame(Draw draw)
|
||||
{
|
||||
ImGui::NewFrame();
|
||||
draw();
|
||||
ImGui::EndFrame();
|
||||
}
|
||||
|
||||
// SetKeyboardFocusHere() activates the field in the next frame that draws it.
|
||||
void draw_input(bool focus)
|
||||
{
|
||||
ImGui::Begin("window");
|
||||
if (focus)
|
||||
ImGui::SetKeyboardFocusHere();
|
||||
ImGui::InputText("##text", text, sizeof(text));
|
||||
ImGui::End();
|
||||
}
|
||||
|
||||
char text[16] = "";
|
||||
};
|
||||
|
||||
void draw_modal()
|
||||
{
|
||||
if (ImGui::BeginPopupModal("modal"))
|
||||
ImGui::EndPopup();
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
TEST_CASE("a vertical wheel event steps ImGui's wheel in its own direction", "[ImGuiWrapper]")
|
||||
@@ -59,3 +102,62 @@ TEST_CASE("a wheel event with no rotation or on the horizontal axis does not ste
|
||||
}));
|
||||
CHECK_THAT(wheel_after(rotation, axis), WithinAbs(0.0, 0.0));
|
||||
}
|
||||
|
||||
TEST_CASE("an InputText counts as active only while it holds the keyboard", "[ImGuiWrapper]")
|
||||
{
|
||||
ImGuiFrames f;
|
||||
f.frame([&] { f.draw_input(false); });
|
||||
CHECK_FALSE(f.imgui.text_input_active());
|
||||
|
||||
f.frame([&] { f.draw_input(true); });
|
||||
f.frame([&] { f.draw_input(false); });
|
||||
CHECK(f.imgui.text_input_active());
|
||||
|
||||
f.frame([] {});
|
||||
f.frame([] {});
|
||||
CHECK_FALSE(f.imgui.text_input_active());
|
||||
}
|
||||
|
||||
TEST_CASE("a modal counts as open from its first frame until a frame no longer draws it", "[ImGuiWrapper]")
|
||||
{
|
||||
ImGuiFrames f;
|
||||
CHECK_FALSE(f.imgui.modal_popup_open());
|
||||
|
||||
f.frame([] {
|
||||
ImGui::OpenPopup("modal");
|
||||
draw_modal();
|
||||
});
|
||||
CHECK(f.imgui.modal_popup_open());
|
||||
|
||||
// A frame opened by input, before anything is drawn in it.
|
||||
ImGui::NewFrame();
|
||||
CHECK(f.imgui.modal_popup_open());
|
||||
draw_modal();
|
||||
ImGui::EndFrame();
|
||||
CHECK(f.imgui.modal_popup_open());
|
||||
|
||||
// A frame that no longer draws it, as when its canvas is hidden.
|
||||
f.frame([] {});
|
||||
REQUIRE(ImGui::GetTopMostPopupModal() != nullptr);
|
||||
CHECK_FALSE(f.imgui.modal_popup_open());
|
||||
}
|
||||
|
||||
TEST_CASE("ImGui owns every key under a modal and text-editing keys in an active InputText", "[ImGuiWrapper]")
|
||||
{
|
||||
ImGuiFrames f;
|
||||
const KeyChord letter{ 'A' };
|
||||
const KeyChord save{ 'S', wxMOD_CONTROL };
|
||||
CHECK_FALSE(f.imgui.owns_key(letter));
|
||||
CHECK_FALSE(f.imgui.owns_key(save));
|
||||
|
||||
f.frame([&] { f.draw_input(true); });
|
||||
f.frame([&] { f.draw_input(false); });
|
||||
CHECK(f.imgui.owns_key(letter));
|
||||
CHECK_FALSE(f.imgui.owns_key(save));
|
||||
|
||||
f.frame([] {
|
||||
ImGui::OpenPopup("modal");
|
||||
draw_modal();
|
||||
});
|
||||
CHECK(f.imgui.owns_key(save));
|
||||
}
|
||||
Reference in new issue
Block a user