diff --git a/resources/images/im_text_search.svg b/resources/images/im_text_search.svg new file mode 100644 index 000000000..64abb3d22 --- /dev/null +++ b/resources/images/im_text_search.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/im_text_search_close.svg b/resources/images/im_text_search_close.svg new file mode 100644 index 000000000..86133d156 --- /dev/null +++ b/resources/images/im_text_search_close.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/imgui/imconfig.h b/src/imgui/imconfig.h index 4c32a701a..51aa772cd 100644 --- a/src/imgui/imconfig.h +++ b/src/imgui/imconfig.h @@ -186,6 +186,9 @@ namespace ImGui const wchar_t SphereButtonDarkIcon = 0x0826; const wchar_t GapFillDarkIcon = 0x0827; + const wchar_t TextSearchIcon = 0x0828; + const wchar_t TextSearchCloseIcon = 0x0829; + // void MyFunction(const char* name, const MyMatrix44& v); } diff --git a/src/imgui/imgui_widgets.cpp b/src/imgui/imgui_widgets.cpp index 2bb13529c..5c7560efb 100644 --- a/src/imgui/imgui_widgets.cpp +++ b/src/imgui/imgui_widgets.cpp @@ -2126,7 +2126,7 @@ bool ImGui::BBLBeginCombo(const char *label, const char *preview_value, ImGuiCom const ImVec2 label_size = CalcTextSize(label, NULL, true); const float expected_w = CalcItemWidth(); const float w = (flags & ImGuiComboFlags_NoPreview) ? arrow_size : expected_w; - const ImRect frame_bb(window->DC.CursorPos - ImVec2(0.0, style.FramePadding.y), window->DC.CursorPos + ImVec2(w - arrow_size * 2, label_size.y + style.FramePadding.y)); + const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w - arrow_size * 2, label_size.y + style.FramePadding.y * 2)); const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f)); ItemSize(total_bb, style.FramePadding.y); if (!ItemAdd(total_bb, id, &frame_bb)) return false; @@ -7185,7 +7185,9 @@ bool ImGui::BBLImageSelectable(ImTextureID user_texture_id, const ImVec2& size_a // Render if (held && (flags & ImGuiSelectableFlags_DrawHoveredWhenHeld)) hovered = true; if (hovered || selected) { - const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header); + ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header); + if (hovered && selected) + col = GetColorU32(ImGuiCol_Header); if (arrow_size == 0) { RenderFrame(bb.Min, ImVec2(bb.Max.x - style.WindowPadding.x, bb.Max.y), col, false, 0.0f); } @@ -7204,9 +7206,9 @@ bool ImGui::BBLImageSelectable(ImTextureID user_texture_id, const ImVec2& size_a // Render const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button); - ImVec2 p_min = bb.Min + ImVec2(2 * style.ItemSpacing.x, (bb.Max.y - bb.Min.y - font_size.y) / 2); + ImVec2 p_min = bb.Min + ImVec2(style.ItemInnerSpacing.x, (bb.Max.y - bb.Min.y - font_size.y) / 2); ImVec2 p_max = p_min + font_size; - window->DrawList->AddImage(user_texture_id, p_min, p_max, uv0, uv1, GetColorU32(tint_col)); + window->DrawList->AddImage(user_texture_id, p_min, p_max, uv0, uv1, selected || (held && hovered) ? GetColorU32(ImVec4(1.f, 1.f, 1.f, 1.f)) : GetColorU32(tint_col)); if (flags & ImGuiSelectableFlags_Disabled) PopStyleColor(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp index 7ec7dda49..4841b8e52 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp @@ -27,7 +27,7 @@ namespace GUI { static const wxColour FONT_TEXTURE_BG = wxColour(0, 0, 0, 0); static const wxColour FONT_TEXTURE_FG = *wxWHITE; static const int FONT_SIZE = 12; - +static const float SELECTABLE_INNER_OFFSET = 8.0f; GLGizmoText::GLGizmoText(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id) : GLGizmoBase(parent, icon_filename, sprite_id) @@ -53,6 +53,7 @@ bool GLGizmoText::on_init() void GLGizmoText::update_font_texture() { + m_font_names.clear(); for (int i = 0; i < m_textures.size(); i++) { if (m_textures[i].texture != nullptr) delete m_textures[i].texture; @@ -78,6 +79,7 @@ void GLGizmoText::update_font_texture() info.font_name = m_avail_font_names[i]; m_textures.push_back(info); m_combo_width = std::max(m_combo_width, static_cast(texture->m_original_width)); + m_font_names.push_back(info.font_name); //} } } @@ -186,8 +188,6 @@ void GLGizmoText::push_combo_style(const float scale) { ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(0.00f, 0.68f, 0.26f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(0.00f, 0.68f, 0.26f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_ScrollbarBg, ImGuiWrapper::COL_WINDOW_BG_DARK); - ImGui::PushStyleColor(ImGuiCol_ScrollbarGrabActive, ImGuiWrapper::COL_WINDOW_BG_DARK); - ImGui::PushStyleColor(ImGuiCol_ScrollbarGrabHovered, ImGuiWrapper::COL_WINDOW_BG_DARK); ImGui::PushStyleColor(ImGuiCol_Button, { 1.00f, 1.00f, 1.00f, 0.0f }); } else { @@ -199,8 +199,6 @@ void GLGizmoText::push_combo_style(const float scale) { ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(0.00f, 0.68f, 0.26f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(0.00f, 0.68f, 0.26f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_ScrollbarBg, ImGuiWrapper::COL_WINDOW_BG); - ImGui::PushStyleColor(ImGuiCol_ScrollbarGrabActive, ImGuiWrapper::COL_WINDOW_BG); - ImGui::PushStyleColor(ImGuiCol_ScrollbarGrabHovered, ImGuiWrapper::COL_WINDOW_BG); ImGui::PushStyleColor(ImGuiCol_Button, { 1.00f, 1.00f, 1.00f, 0.0f }); } } @@ -208,7 +206,7 @@ void GLGizmoText::push_combo_style(const float scale) { void GLGizmoText::pop_combo_style() { ImGui::PopStyleVar(2); - ImGui::PopStyleColor(9); + ImGui::PopStyleColor(7); } // BBS @@ -262,6 +260,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) const float currt_scale = m_parent.get_scale(); ImGuiWrapper::push_toolbar_style(currt_scale); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.0,5.0) * currt_scale); + ImGui::PushStyleVar(ImGuiStyleVar_ScrollbarSize, 4.0f * currt_scale); GizmoImguiBegin("Text", ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoTitleBar); float space_size = m_imgui->get_style_scaling() * 8; @@ -273,7 +272,11 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) float input_text_size = m_imgui->scaled(12.0f); float button_size = ImGui::GetFrameHeight(); - float input_size = input_text_size - button_size * 2 - ImGui::GetStyle().ItemSpacing.x * 4; + + ImVec2 selectable_size(std::max((input_text_size + ImGui::GetFrameHeight() * 2), m_combo_width + SELECTABLE_INNER_OFFSET * currt_scale), m_combo_height); + float list_width = selectable_size.x + ImGui::GetStyle().ScrollbarSize + 2 * currt_scale; + + float input_size = list_width - button_size * 2 - ImGui::GetStyle().ItemSpacing.x * 4; ImTextureID normal_B = m_parent.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TEXT_B); ImTextureID normal_T = m_parent.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TEXT_T); @@ -294,30 +297,41 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) m_imgui->text(_L("Font")); ImGui::SameLine(caption_size); - ImGui::PushItemWidth(input_text_size + ImGui::GetFrameHeight() * 2); + ImGui::PushItemWidth(list_width); push_combo_style(currt_scale); - int font_index = m_curr_font_idx; - if (ImGui::BBLBeginCombo("##Font", m_textures[m_curr_font_idx].font_name.c_str(), 0)) { - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 0.0f); - ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(4.0f, 0.0f) * currt_scale); - ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8, 4)); - for (int i = 0; i < m_textures.size(); i++) { - const bool is_selected = (m_curr_font_idx == i); - ImTextureID icon_id = (ImTextureID)(intptr_t)(m_textures[i].texture->get_id()); + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); + ImGui::PushStyleVar(ImGuiStyleVar_PopupRounding, 4.0f * currt_scale); + + std::vector filtered_items_idx; + bool is_filtered = false; + if (m_imgui->bbl_combo_with_filter("##Combo_Font", m_font_names[m_curr_font_idx], m_font_names, &filtered_items_idx, &is_filtered, selectable_size.y)) { + int show_items_count = is_filtered ? filtered_items_idx.size() : m_textures.size(); + + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0)); + ImGui::PushStyleVar(ImGuiStyleVar_ItemInnerSpacing, ImVec2(SELECTABLE_INNER_OFFSET, 0)* currt_scale); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 0); + for (int i = 0; i < show_items_count; i++) + { + int idx = is_filtered ? filtered_items_idx[i] : i; + const bool is_selected = (idx == m_curr_font_idx); + ImTextureID icon_id = (ImTextureID)(intptr_t)(m_textures[idx].texture->get_id()); ImVec4 tint_color = ImGui::GetStyleColorVec4(ImGuiCol_Text); - ImVec2 selectable_size(std::max((input_text_size + ImGui::GetFrameHeight() * 2), m_combo_width), m_combo_height); - if (ImGui::BBLImageSelectable(icon_id, selectable_size, { (float)m_textures[i].w, (float)m_textures[i].h }, m_textures[i].hl, tint_color, { 0, 0 }, {1, 1}, is_selected)) { - m_curr_font_idx = i; + if (ImGui::BBLImageSelectable(icon_id, selectable_size, { (float)m_textures[idx].w, (float)m_textures[idx].h }, m_textures[idx].hl, tint_color, { 0, 0 }, { 1, 1 }, is_selected)) + { + m_curr_font_idx = idx; m_font_name = m_textures[m_curr_font_idx].font_name; + ImGui::CloseCurrentPopup(); } if (is_selected) { ImGui::SetItemDefaultFocus(); } } ImGui::PopStyleVar(3); - ImGui::EndCombo(); + ImGui::EndListBox(); + ImGui::EndPopup(); } + ImGui::PopStyleVar(2); pop_combo_style(); ImGui::AlignTextToFramePadding(); m_imgui->text(_L("Size")); @@ -344,27 +358,27 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) ImGui::AlignTextToFramePadding(); m_imgui->text(_L("Thickness")); ImGui::SameLine(caption_size); - ImGui::PushItemWidth(input_text_size); + ImGui::PushItemWidth(list_width); ImGui::InputFloat("###text_thickness", &m_thickness,0.0f, 0.0f, "%.2f"); if (m_thickness < 0.1f)m_thickness = 0.1f; ImGui::AlignTextToFramePadding(); m_imgui->text(_L("Input text")); ImGui::SameLine(caption_size); - ImGui::PushItemWidth(input_text_size); + ImGui::PushItemWidth(list_width); ImGui::InputText("", m_text, sizeof(m_text)); ImGui::Separator(); m_imgui->disabled_begin(m_text[0] == '\0' || m_text[0] == ' '); - float offset = caption_size + input_text_size - m_imgui->calc_text_size(_L("Add")).x - space_size; + float offset = caption_size + list_width - m_imgui->calc_text_size(m_is_modify ? _L("Modify") : _L("Add")).x - space_size; ImGui::Dummy({0.0, 0.0}); ImGui::SameLine(offset); bool btn_clicked = m_imgui->button(m_is_modify ? _L("Modify") : _L("Add")); if (btn_clicked) { m_imgui->disabled_end(); GizmoImguiEnd(); - ImGui::PopStyleVar(); + ImGui::PopStyleVar(2); ImGuiWrapper::pop_toolbar_style(); TextInfo text_info; @@ -412,7 +426,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) #endif GizmoImguiEnd(); - ImGui::PopStyleVar(); + ImGui::PopStyleVar(2); ImGuiWrapper::pop_toolbar_style(); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.hpp b/src/slic3r/GUI/Gizmos/GLGizmoText.hpp index 1fc3239ac..d1494f80e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.hpp @@ -39,6 +39,8 @@ private: std::vector m_textures; + std::vector m_font_names; + bool m_is_modify = false; int m_object_idx; int m_volume_idx; diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index 1582fe35a..027a51915 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -82,6 +82,8 @@ static const std::map font_icons = { {ImGui::GapFillDarkIcon , "gap_fill_dark" }, {ImGui::SphereButtonDarkIcon , "toolbar_modifier_sphere_dark" }, + {ImGui::TextSearchIcon , "im_text_search" }, + {ImGui::TextSearchCloseIcon , "im_text_search_close" }, }; static const std::map font_icons_large = { {ImGui::CloseNotifButton , "notification_close" }, @@ -542,6 +544,123 @@ void ImGuiWrapper::set_next_window_size(float x, float y, ImGuiCond cond) } /* BBL style widgets */ +bool ImGuiWrapper::bbl_combo_with_filter(const char* label, const std::string& preview_value, const std::vector& all_items, std::vector* filtered_items_idx, bool* is_filtered, float item_height) +{ + ImGuiContext& g = *GImGui; + const ImGuiStyle& style = g.Style; + ImGuiWindow* window = ImGui::GetCurrentWindow(); + if (window->SkipItems) + return false; + + static char pattern_buffer[256] = { 0 }; + auto simple_match = [](const char* pattern, const char* str) { + wxString sub_str = wxString(pattern).Lower(); + wxString main_str = wxString(str).Lower(); + return main_str.Find(sub_str); + }; + + bool is_filtering = false; + bool is_new_open = false; + + float sz = ImGui::GetFrameHeight(); + ImVec2 arrow_size(sz, sz); + ImVec2 CursorPos = window->DC.CursorPos; + const ImRect arrow_bb(CursorPos, CursorPos + arrow_size); + + float ButtonTextAlignX = g.Style.ButtonTextAlign.x; + g.Style.ButtonTextAlign.x = 0; + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { sz, style.FramePadding.y}); + ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered)); + if (button(preview_value + label, ImGui::CalcItemWidth(), 0)) + { + ImGui::OpenPopup(label); + is_new_open = true; + } + g.Style.ButtonTextAlign.x = ButtonTextAlignX; + ImGui::PopStyleVar(); + ImGui::PopStyleColor(); + ImGui::BBLRenderArrow(window->DrawList, arrow_bb.Min + ImVec2(ImMax(0.0f, (arrow_size.x - g.FontSize) * 0.5f), ImMax(0.0f, (arrow_size.y - g.FontSize) * 0.5f)), ImGui::GetColorU32(ImGuiCol_Text), ImGuiDir_Down); + + if (is_new_open) + memset(pattern_buffer, 0, IM_ARRAYSIZE(pattern_buffer)); + + float item_rect_width = ImGui::GetItemRectSize().x; + float item_rect_height = item_height ? item_height : ImGui::GetItemRectSize().y; + ImGui::SetNextWindowPos({ CursorPos.x, ImGui::GetItemRectMax().y + 4 * m_style_scaling }); + ImGui::SetNextWindowSize({ item_rect_width, 0 }); + if (ImGui::BeginPopup(label)) + { + ImGuiWindow* popup_window = ImGui::GetCurrentWindow(); + + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0)); + + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8.0f * m_style_scaling, item_rect_height - g.FontSize) * 0.5f); + wchar_t ICON_SEARCH = *pattern_buffer != '\0' ? ImGui::TextSearchCloseIcon : ImGui::TextSearchIcon; + const ImVec2 label_size = ImGui::CalcTextSize(into_u8(ICON_SEARCH).c_str(), nullptr, true); + const ImVec2 search_icon_pos(ImGui::GetItemRectMax().x - label_size.x, popup_window->DC.CursorPos.y + style.FramePadding.y); + ImGui::RenderText(search_icon_pos, into_u8(ICON_SEARCH).c_str()); + + auto temp = popup_window->DC.CursorPos; + popup_window->DC.CursorPos = search_icon_pos; + ImGui::PushStyleColor(ImGuiCol_Button, {0, 0, 0, 0}); + ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGui::GetStyleColorVec4(ImGuiCol_Button)); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_Button)); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_Button)); + ImGui::PushStyleColor(ImGuiCol_Border, { 0, 0, 0, 0 }); + if (button("##invisible_clear_button", label_size.x, label_size.y)) + { + if (*pattern_buffer != '\0') + memset(pattern_buffer, 0, IM_ARRAYSIZE(pattern_buffer)); + } + ImGui::PopStyleColor(5); + popup_window->DC.CursorPos = temp; + + + ImGui::PushItemWidth(item_rect_width); + if (is_new_open) + ImGui::SetKeyboardFocusHere(); + ImGui::InputText("##bbl_combo_with_filter_inputText", pattern_buffer, sizeof(pattern_buffer)); + ImGui::PopItemWidth(); + ImGui::PopStyleVar(); + + if (*pattern_buffer != '\0') + is_filtering = true; + + if (is_filtering) + { + std::vector > filtered_items_with_priority;// std::pair + for (int i = 0; i < all_items.size(); i++) + { + int priority = simple_match(pattern_buffer, all_items[i].c_str()); + if (priority != wxNOT_FOUND) + filtered_items_with_priority.push_back({ i, priority }); + } + std::sort(filtered_items_with_priority.begin(), filtered_items_with_priority.end(), [](const std::pair& a, const std::pair& b) {return (b.second > a.second); }); + for (auto item : filtered_items_with_priority) + { + filtered_items_idx->push_back(item.first); + } + } + + *is_filtered = is_filtering; + + popup_window->DC.CursorPos.y -= 1 * m_style_scaling; + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(1.0f, 1.0f) * m_style_scaling); + if (ImGui::BeginListBox("##bbl_combo_with_filter_listBox", { item_rect_width, item_rect_height * 7.75f})) { + ImGui::PopStyleVar(2); + return true; + } + else + { + ImGui::PopStyleVar(2); + ImGui::EndPopup(); + return false; + } + } + else + return false; +} + bool ImGuiWrapper::bbl_input_double(const wxString& label, const double& value, const std::string& format) { //return ImGui::InputDouble(label.c_str(), const_cast(&value), 0.0f, 0.0f, format.c_str(), ImGuiInputTextFlags_CharsDecimal); diff --git a/src/slic3r/GUI/ImGuiWrapper.hpp b/src/slic3r/GUI/ImGuiWrapper.hpp index 5280b876b..001f9bea4 100644 --- a/src/slic3r/GUI/ImGuiWrapper.hpp +++ b/src/slic3r/GUI/ImGuiWrapper.hpp @@ -99,6 +99,7 @@ public: void set_next_window_size(float x, float y, ImGuiCond cond); /* BBL style widgets */ + bool bbl_combo_with_filter(const char* label, const std::string& preview_value, const std::vector& all_items, std::vector* filtered_items_idx, bool* is_filtered, float item_height = 0.0f); bool bbl_input_double(const wxString &label, const double &value, const std::string &format = "%0.2f"); bool bbl_slider_float(const std::string &label, float* v, float v_min, float v_max, const char* format = "%.3f", float power = 1.0f, bool clamp = true, const wxString& tooltip = {}); bool bbl_slider_float_style(const std::string &label, float* v, float v_min, float v_max, const char* format = "%.3f", float power = 1.0f, bool clamp = true, const wxString& tooltip = {});