diff --git a/resources/images/text_B.svg b/resources/images/text_B.svg new file mode 100644 index 0000000000..c792b4be4d --- /dev/null +++ b/resources/images/text_B.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/text_B_hover.svg b/resources/images/text_B_hover.svg new file mode 100644 index 0000000000..2242afa388 --- /dev/null +++ b/resources/images/text_B_hover.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/text_B_press.svg b/resources/images/text_B_press.svg new file mode 100644 index 0000000000..5333b0ef6f --- /dev/null +++ b/resources/images/text_B_press.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/text_T.svg b/resources/images/text_T.svg new file mode 100644 index 0000000000..fa5cb783b3 --- /dev/null +++ b/resources/images/text_T.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/text_T_hover.svg b/resources/images/text_T_hover.svg new file mode 100644 index 0000000000..2a7880cee0 --- /dev/null +++ b/resources/images/text_T_hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/images/text_T_press.svg b/resources/images/text_T_press.svg new file mode 100644 index 0000000000..9d1da57e2b --- /dev/null +++ b/resources/images/text_T_press.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/imgui/imgui.h b/src/imgui/imgui.h index 4b3c13ac60..4aa9dac3e9 100644 --- a/src/imgui/imgui.h +++ b/src/imgui/imgui.h @@ -491,6 +491,7 @@ namespace ImGui IMGUI_API bool ImageButton2(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1, 1), int frame_padding = -1, const ImVec4& bg_col = ImVec4(0, 0, 0, 0), const ImVec4& tint_col = ImVec4(1, 1, 1, 1), const ImVec2& margin = ImVec2(0, 0)); // <0 frame_padding uses default frame padding settings. 0 for no padding IMGUI_API bool ImageTextButton(const ImVec2& button_size, const char* text, ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1, 1), int frame_padding = -1, const ImVec4& bg_col = ImVec4(0, 0, 0, 0), const ImVec4& tint_col = ImVec4(1, 1, 1, 1), const ImVec2& margin = ImVec2(0, 0)); IMGUI_API bool ImageButton3(ImTextureID user_texture_id,ImTextureID user_texture_id_hover, const ImVec2& size, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1, 1), int frame_padding = -1, const ImVec4& bg_col = ImVec4(0, 0, 0, 0), const ImVec4& tint_col = ImVec4(1, 1, 1, 1), const ImVec2& margin = ImVec2(0, 0)); // <0 frame_padding uses default frame padding settings. 0 for no padding + IMGUI_API bool BBLImageButton(ImTextureID user_texture_id,ImTextureID user_texture_id_hover,ImTextureID user_texture_id_press, const ImVec2& size, bool &value, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1, 1), int frame_padding = -1, const ImVec4& bg_col = ImVec4(0, 0, 0, 0), const ImVec4& tint_col = ImVec4(1, 1, 1, 1), const ImVec2& margin = ImVec2(0, 0)); // <0 frame_padding uses default frame padding settings. 0 for no padding IMGUI_API bool Checkbox(const char* label, bool* v); IMGUI_API bool BBLCheckbox(const char* label, bool* v); IMGUI_API bool CheckboxFlags(const char* label, int* flags, int flags_value); diff --git a/src/imgui/imgui_internal.h b/src/imgui/imgui_internal.h index c49ec09635..018654d8a0 100644 --- a/src/imgui/imgui_internal.h +++ b/src/imgui/imgui_internal.h @@ -2554,6 +2554,7 @@ namespace ImGui IMGUI_API bool ImageButtonEx(ImGuiID id, ImTextureID texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, const ImVec2& padding, const ImVec4& bg_col, const ImVec4& tint_col); IMGUI_API bool ImageButtonEx2(ImGuiID id, ImTextureID texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, const ImVec2& padding, const ImVec4& bg_col, const ImVec4& tint_col, const ImVec2& margin); IMGUI_API bool ImageButtonEx3(ImGuiID id, ImTextureID texture_id,ImTextureID texture_id_hover, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, const ImVec2& padding, const ImVec4& bg_col, const ImVec4& tint_col, const ImVec2& margin); + IMGUI_API bool BBLImageButtonEx(ImGuiID id, ImTextureID texture_id,ImTextureID texture_id_hover,ImTextureID texture_id_press, const ImVec2& size, bool &value, const ImVec2& uv0, const ImVec2& uv1, const ImVec2& padding, const ImVec4& bg_col, const ImVec4& tint_col, const ImVec2& margin); IMGUI_API ImRect GetWindowScrollbarRect(ImGuiWindow* window, ImGuiAxis axis); IMGUI_API ImGuiID GetWindowScrollbarID(ImGuiWindow* window, ImGuiAxis axis); IMGUI_API ImGuiID GetWindowResizeCornerID(ImGuiWindow* window, int n); // 0..3: corners diff --git a/src/imgui/imgui_widgets.cpp b/src/imgui/imgui_widgets.cpp index f729d652f0..46f3472819 100644 --- a/src/imgui/imgui_widgets.cpp +++ b/src/imgui/imgui_widgets.cpp @@ -1205,6 +1205,40 @@ bool ImGui::ImageButtonEx3(ImGuiID id,ImTextureID texture_id,ImTextureID tex return pressed; } +bool ImGui::BBLImageButtonEx(ImGuiID id,ImTextureID texture_id,ImTextureID texture_id_hover, ImTextureID texture_id_press, const ImVec2 &size, bool &value,const ImVec2 &uv0,const ImVec2 &uv1,const ImVec2 &padding,const ImVec4 &bg_col,const ImVec4 &tint_col,const ImVec2 &margin) +{ + ImGuiContext &g = *GImGui; + ImGuiWindow * window = GetCurrentWindow(); + if (window->SkipItems) return false; + + const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size + padding * 2 + margin * 2); + ItemSize(bb); + if (!ItemAdd(bb, id)) return false; + + bool hovered, held; + bool pressed = ButtonBehavior(bb, id, &hovered, &held); + if (pressed) value = !value; + + // Render + const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button); + RenderNavHighlight(bb, id); + + const float border_size = g.Style.FrameBorderSize; + if (border_size > 0.0f) { + window->DrawList->AddRect(bb.Min + ImVec2(1, 1), bb.Max + ImVec2(1, 1), col, g.Style.FrameRounding, 0, border_size); + window->DrawList->AddRect(bb.Min, bb.Max, col, g.Style.FrameRounding, 0, border_size); + } + + if (bg_col.w > 0.0f) window->DrawList->AddRectFilled(bb.Min + padding, bb.Max - padding, GetColorU32(bg_col)); + + window->DrawList->AddImage(texture_id, bb.Min + padding + margin, bb.Max - padding - margin, uv0, uv1, GetColorU32(tint_col)); + + if (hovered)window->DrawList->AddImage(texture_id_hover, bb.Min + padding + margin, bb.Max - padding - margin, uv0, uv1, GetColorU32(tint_col)); + + if (value)window->DrawList->AddImage(texture_id_press, bb.Min + padding + margin, bb.Max - padding - margin, uv0, uv1, GetColorU32(tint_col)); + + return pressed; +} bool ImGui::ImageButton(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, int frame_padding, const ImVec4& bg_col, const ImVec4& tint_col) { @@ -1256,6 +1290,20 @@ bool ImGui::ImageButton3(ImTextureID user_texture_id,ImTextureID user_texture_id return ImageButtonEx3(id, user_texture_id, user_texture_id_hover, size, uv0, uv1, padding, bg_col, tint_col, margin); } +bool ImGui::BBLImageButton(ImTextureID user_texture_id,ImTextureID user_texture_id_hover, ImTextureID user_texture_id_press, const ImVec2 &size, bool &value, const ImVec2 &uv0, const ImVec2 &uv1, int frame_padding, const ImVec4 &bg_col, const ImVec4 &tint_col, const ImVec2 &margin) +{ + ImGuiContext &g = *GImGui; + ImGuiWindow * window = g.CurrentWindow; + if (window->SkipItems) return false; + + // Default to using texture ID as ID. User can still push string/integer prefixes. + PushID((void *) (intptr_t) user_texture_id); + const ImGuiID id = window->GetID("#image"); + PopID(); + + const ImVec2 padding = (frame_padding >= 0) ? ImVec2((float) frame_padding, (float) frame_padding) : g.Style.FramePadding; + return BBLImageButtonEx(id, user_texture_id, user_texture_id_hover, user_texture_id_press, size,value, uv0, uv1, padding, bg_col, tint_col, margin); +} bool ImGui::ImageTextButton(const ImVec2& button_size, const char* text, ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0, const ImVec2& uv1, int frame_padding, const ImVec4& bg_col, const ImVec4& tint_col, const ImVec2& margin) { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp index 8ce8931cdc..0e3909e5c7 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp @@ -63,24 +63,59 @@ void GLGizmoText::on_render_for_picking() // TODO: } +void GLGizmoText::push_combo_style() +{ + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 1.0f); + ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f); + ImGui::PushStyleColor(ImGuiCol_PopupBg, ImGuiWrapper::COL_WINDOW_BG); + ImGui::PushStyleColor(ImGuiCol_BorderActive, ImVec4(0.00f, 0.68f, 0.26f, 1.00f)); + ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(0.00f, 0.68f, 0.26f, 0.0f)); + 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_Button, { 1.00f, 1.00f, 1.00f, 0.0f }); +} + +void GLGizmoText::pop_combo_style() +{ + ImGui::PopStyleVar(2); + ImGui::PopStyleColor(7); +} + // BBS void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) { + const float win_h = ImGui::GetWindowHeight(); + y = std::min(y, bottom_limit - win_h); + GizmoImguiSetNextWIndowPos(x, y, ImGuiCond_Always, 0.0f, 0.0f); + static float last_y = 0.0f; static float last_h = 0.0f; - float space_size = m_imgui->get_style_scaling() * 8; - float font_cap = m_imgui->calc_text_size("Font ").x; - float size_cap = m_imgui->calc_text_size("Size ").x; - float thickness_cap = m_imgui->calc_text_size("Thickness ").x; - float caption_size = std::max(std::max(font_cap, size_cap), thickness_cap) + 2 * space_size; + ImGuiWrapper::push_toolbar_style(m_parent.get_scale()); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {4.0,5.0}); + GizmoImguiBegin("Text", ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoTitleBar); - m_imgui->begin(_L("Text"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse); + float space_size = m_imgui->get_style_scaling() * 8; + float font_cap = m_imgui->calc_text_size(_L("Font")).x; + float size_cap = m_imgui->calc_text_size(_L("Size")).x; + float thickness_cap = m_imgui->calc_text_size(_L("Thickness")).x; + float input_cap = m_imgui->calc_text_size(_L("Input text")).x; + float caption_size = std::max(std::max(font_cap, size_cap), std::max(thickness_cap, input_cap)) + space_size + ImGui::GetStyle().WindowPadding.x; + + float input_text_size = m_imgui->scaled(12.0f); + float button_size = m_imgui->scaled(1.4f); + float input_size = input_text_size - 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 press_B_hover = m_parent.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TEXT_B_HOVER); + ImTextureID press_B_press = m_parent.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TEXT_B_PRESS); + + ImTextureID normal_T = m_parent.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TEXT_T); + ImTextureID press_T_hover = m_parent.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TEXT_T_HOVER); + ImTextureID press_T_press = m_parent.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TEXT_T_PRESS); // adjust window position to avoid overlap the view toolbar - const float win_h = ImGui::GetWindowHeight(); - y = std::min(y, bottom_limit - win_h); - ImGui::SetWindowPos(ImVec2(x, y), ImGuiCond_Always); if (last_h != win_h || last_y != y) { // ask canvas for another frame to render the window in the correct position m_imgui->set_requires_extra_frame(); @@ -96,32 +131,61 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) for (int i = 0; i < m_avail_font_names.size(); i++) cstr_font_names[i] = m_avail_font_names[i].c_str(); + m_imgui->text(_L("Font")); + ImGui::SameLine(caption_size); + ImGui::PushItemWidth(input_text_size + ImGui::GetFrameHeight() * 2); + push_combo_style(); + if (ImGui::BBLBeginCombo("##Font", cstr_font_names[m_curr_font_idx], 0)) { + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 0.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(4.0f, 0.0f)); + for (int i = 0; i < m_avail_font_names.size(); i++) { + const bool is_selected = (m_curr_font_idx == i); + if (ImGui::BBLSelectable(cstr_font_names[i], is_selected)) { + m_curr_font_idx = i; + } + if (is_selected) { + ImGui::SetItemDefaultFocus(); + } + } + ImGui::PopStyleVar(2); + ImGui::EndCombo(); + } + + ImGui::AlignTextToFramePadding(); + pop_combo_style(); + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, 0.0f)); + m_imgui->text(_L("Size")); + ImGui::SameLine(caption_size); + ImGui::PushItemWidth(input_size); + ImGui::InputFloat("###font_size", &m_font_size, 0.0f, 0.0f, "%.2f"); + if (m_font_size < 3.0f)m_font_size = 3.0f; + ImGui::PopStyleVar(1); + ImGui::SameLine(); + + ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0); + ImGui::BBLImageButton(normal_B,press_B_hover,press_B_press,{button_size,button_size},m_bold); + ImGui::SameLine(); + ImGui::BBLImageButton(normal_T,press_T_hover,press_T_press,{button_size,button_size},m_italic); + ImGui::PopStyleVar(); + + ImGui::AlignTextToFramePadding(); + m_imgui->text(_L("Thickness")); + ImGui::SameLine(caption_size); + ImGui::PushItemWidth(input_text_size); + 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::InputText("", m_text, sizeof(m_text)); - - ImGui::PushItemWidth(caption_size); - ImGui::Text("Font "); - ImGui::SameLine(); - ImGui::PushItemWidth(150); - ImGui::Combo("##Font", &m_curr_font_idx, cstr_font_names, m_avail_font_names.size()); - - ImGui::PushItemWidth(caption_size); - ImGui::Text("Size "); - ImGui::SameLine(); - ImGui::PushItemWidth(150); - ImGui::InputFloat("###font_size", &m_font_size); - - ImGui::PushItemWidth(caption_size); - ImGui::Text("Thickness "); - ImGui::SameLine(); - ImGui::PushItemWidth(150); - ImGui::InputFloat("###text_thickness", &m_thickness); - - ImGui::Checkbox("Bold", &m_bold); - ImGui::SameLine(); - ImGui::Checkbox("Italic", &m_italic); - + 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; + ImGui::Dummy({0.0, 0.0}); + ImGui::SameLine(offset); bool add_clicked = m_imgui->button(_L("Add")); if (add_clicked) { TriangleMesh mesh; @@ -129,8 +193,11 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) ObjectList* obj_list = wxGetApp().obj_list(); obj_list->load_mesh_part(mesh, "text_shape"); } + m_imgui->disabled_end(); - m_imgui->end(); + GizmoImguiEnd(); + ImGui::PopStyleVar(); + ImGuiWrapper::pop_toolbar_style(); } } // namespace GUI diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.hpp b/src/slic3r/GUI/Gizmos/GLGizmoText.hpp index dd73c74a22..a711933e86 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.hpp @@ -32,6 +32,8 @@ protected: virtual bool on_is_activable() const override; virtual void on_render() override; virtual void on_render_for_picking() override; + void push_combo_style(); + void pop_combo_style(); virtual void on_set_state() override; virtual CommonGizmosDataID on_get_requirements() const override; virtual void on_render_input_window(float x, float y, float bottom_limit); diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 194a033d68..b8b3ddef99 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -196,6 +196,37 @@ bool GLGizmosManager::init_icon_textures() else return false; + + if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/text_B.svg", 20, 20, texture_id)) + icon_list.insert(std::make_pair((int)IC_TEXT_B, texture_id)); + else + return false; + + if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/text_B_hover.svg", 20, 20, texture_id)) + icon_list.insert(std::make_pair((int)IC_TEXT_B_HOVER, texture_id)); + else + return false; + + if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/text_B_press.svg", 20, 20, texture_id)) + icon_list.insert(std::make_pair((int)IC_TEXT_B_PRESS, texture_id)); + else + return false; + + if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/text_T.svg", 20, 20, texture_id)) + icon_list.insert(std::make_pair((int)IC_TEXT_T, texture_id)); + else + return false; + + if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/text_T_hover.svg", 20, 20, texture_id)) + icon_list.insert(std::make_pair((int)IC_TEXT_T_HOVER, texture_id)); + else + return false; + + if (IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/text_T_press.svg", 20, 20, texture_id)) + icon_list.insert(std::make_pair((int)IC_TEXT_T_PRESS, texture_id)); + else + return false; + return true; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp index 3b03784fa6..c1338fdf38 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp @@ -151,6 +151,12 @@ public: IC_TOOLBAR_RESET_HOVER, IC_TOOLBAR_TOOLTIP, IC_TOOLBAR_TOOLTIP_HOVER, + IC_TEXT_B, + IC_TEXT_B_HOVER, + IC_TEXT_B_PRESS, + IC_TEXT_T, + IC_TEXT_T_HOVER, + IC_TEXT_T_PRESS, IC_NAME_COUNT, };