mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: focus of text tool window 

Change-Id: I474f314e07234b8f5fc2db7ccd505d85539659e4
This commit is contained in:
liz.li 2022-12-06 09:18:22 +08:00 committed by Lane.Wei
parent 09ab775667
commit 156afc385a
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/Gizmos/GLGizmoText.cpp
View File

@ -246,7 +246,6 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit)
ImGui::SameLine(caption_size); ImGui::SameLine(caption_size);
ImGui::PushItemWidth(input_text_size); ImGui::PushItemWidth(input_text_size);
ImGui::SetKeyboardFocusHere(0);
ImGui::InputText("", m_text, sizeof(m_text)); ImGui::InputText("", m_text, sizeof(m_text));
ImGui::Separator(); ImGui::Separator();

35
src/slic3r/GUI/IMSlider.cpp
View File

@ -1279,7 +1279,7 @@ void IMSlider::render_input_custom_gcode()
return; return;
ImGuiWrapper& imgui = *wxGetApp().imgui(); ImGuiWrapper& imgui = *wxGetApp().imgui();
static bool move_to_center = true; static bool move_to_center = true;
static bool set_focus_when_appearing = true; static bool set_focus = true;
if (move_to_center) { if (move_to_center) {
auto pos_x = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_width() / 2; auto pos_x = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_width() / 2;
auto pos_y = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_height() / 2; auto pos_y = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_height() / 2;
@ -1299,9 +1299,11 @@ void IMSlider::render_input_custom_gcode()
| ImGuiWindowFlags_NoScrollWithMouse; | ImGuiWindowFlags_NoScrollWithMouse;
imgui.begin(_u8L("Custom G-code"), windows_flag); imgui.begin(_u8L("Custom G-code"), windows_flag);
imgui.text(_u8L("Enter Custom G-code used on current layer:")); imgui.text(_u8L("Enter Custom G-code used on current layer:"));
if (set_focus_when_appearing) { if (ImGui::IsMouseClicked(0)) {
set_focus = false;
}
if (set_focus && !ImGui::IsAnyItemActive() && !ImGui::IsMouseClicked(0)) {
ImGui::SetKeyboardFocusHere(0); ImGui::SetKeyboardFocusHere(0);
set_focus_when_appearing = false;
} }
int text_height = 6; int text_height = 6;
ImGui::InputTextMultiline("##text", m_custom_gcode, sizeof(m_custom_gcode), ImVec2(-1, ImGui::GetTextLineHeight() * text_height)); ImGui::InputTextMultiline("##text", m_custom_gcode, sizeof(m_custom_gcode), ImVec2(-1, ImGui::GetTextLineHeight() * text_height));
@ -1318,7 +1320,7 @@ void IMSlider::render_input_custom_gcode()
m_show_custom_gcode_window = false; m_show_custom_gcode_window = false;
add_custom_gcode(m_custom_gcode); add_custom_gcode(m_custom_gcode);
move_to_center = true; move_to_center = true;
set_focus_when_appearing = true; set_focus = true;
} }
imgui.pop_confirm_button_style(); imgui.pop_confirm_button_style();
@ -1327,7 +1329,7 @@ void IMSlider::render_input_custom_gcode()
if (imgui.bbl_button(_L("Cancel")) || ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_Escape))) { if (imgui.bbl_button(_L("Cancel")) || ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
m_show_custom_gcode_window = false; m_show_custom_gcode_window = false;
move_to_center = true; move_to_center = true;
set_focus_when_appearing = true; set_focus = true;
} }
imgui.pop_cancel_button_style(); imgui.pop_cancel_button_style();
@ -1346,7 +1348,7 @@ void IMSlider::render_go_to_layer_dialog(){
return; return;
ImGuiWrapper& imgui = *wxGetApp().imgui(); ImGuiWrapper& imgui = *wxGetApp().imgui();
static bool move_to_center = true; static bool move_to_center = true;
static bool set_focus_when_appearing = true; static bool set_focus = true;
if (move_to_center) { if (move_to_center) {
auto pos_x = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_width() / 2; auto pos_x = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_width() / 2;
auto pos_y = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_height() / 2; auto pos_y = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_height() / 2;
@ -1364,17 +1366,18 @@ void IMSlider::render_go_to_layer_dialog(){
| ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoResize
| ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollbar
| ImGuiWindowFlags_NoScrollWithMouse; | ImGuiWindowFlags_NoScrollWithMouse;
imgui.begin(_u8L("Go to layer"), windows_flag); imgui.begin(_u8L("Jump to layer"), windows_flag);
imgui.text(_u8L("Layer number") + " (" + std::to_string(m_min_value) + " - " + std::to_string(m_max_value) + "):"); imgui.text(_u8L("Please enter the layer number") + " (" + std::to_string(m_min_value) + " - " + std::to_string(m_max_value) + "):");
ImGui::PushItemWidth(210 * m_scale); if (ImGui::IsMouseClicked(0)) {
if (set_focus_when_appearing) { set_focus = false;
}
if (set_focus && !ImGui::IsAnyItemActive() && !ImGui::IsMouseClicked(0)) {
ImGui::SetKeyboardFocusHere(0); ImGui::SetKeyboardFocusHere(0);
set_focus_when_appearing = false;
} }
ImGui::InputText("##input_layer_number", m_layer_number, sizeof(m_layer_number)); ImGui::InputText("##input_layer_number", m_layer_number, sizeof(m_layer_number));
ImGui::NewLine(); ImGui::NewLine();
ImGui::SameLine(GImGui->Style.WindowPadding.x * 6); ImGui::SameLine(GImGui->Style.WindowPadding.x * 8);
imgui.push_confirm_button_style(); imgui.push_confirm_button_style();
bool disable_button = false; bool disable_button = false;
if (strlen(m_layer_number) == 0) if (strlen(m_layer_number) == 0)
@ -1390,11 +1393,11 @@ void IMSlider::render_go_to_layer_dialog(){
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true); ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
imgui.push_button_disable_style(); imgui.push_button_disable_style();
} }
if (imgui.bbl_button(_L("OK"))) { if (imgui.bbl_button(_L("OK")) || (!disable_button && ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_Enter)))) {
do_go_to_layer(atoi(m_layer_number)); do_go_to_layer(atoi(m_layer_number));
m_show_go_to_layer_dialog = false; m_show_go_to_layer_dialog = false;
move_to_center = true; move_to_center = true;
set_focus_when_appearing = true; set_focus = true;
} }
if (disable_button) { if (disable_button) {
ImGui::PopItemFlag(); ImGui::PopItemFlag();
@ -1404,10 +1407,10 @@ void IMSlider::render_go_to_layer_dialog(){
ImGui::SameLine(); ImGui::SameLine();
imgui.push_cancel_button_style(); imgui.push_cancel_button_style();
if (imgui.bbl_button(_L("Cancel"))) { if (imgui.bbl_button(_L("Cancel")) || ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
m_show_go_to_layer_dialog = false; m_show_go_to_layer_dialog = false;
move_to_center = true; move_to_center = true;
set_focus_when_appearing = true; set_focus = true;
} }
imgui.pop_cancel_button_style(); imgui.pop_cancel_button_style();