GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-13 19:51:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Calculate window size

Browse Source
This commit is contained in:
Filip Sykala 2021-11-26 14:39:19 +01:00
parent b143c543c7
commit 01b85e4051
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -235,7 +235,6 @@ void GLGizmoEmboss::set_fine_position()
Point(offset.x, offset.y + windows_size.y)}); Point(offset.x, offset.y + windows_size.y)});
ImGuiWrapper::draw(hull); ImGuiWrapper::draw(hull);
ImGuiWrapper::draw(rect); ImGuiWrapper::draw(rect);
// m_gui_cfg->offset = offset;
} }
#ifdef ALLOW_DEBUG_MODE #ifdef ALLOW_DEBUG_MODE
@ -289,6 +288,7 @@ void GLGizmoEmboss::on_render_for_picking() {}
void GLGizmoEmboss::on_render_input_window(float x, float y, float bottom_limit) void GLGizmoEmboss::on_render_input_window(float x, float y, float bottom_limit)
{ {
initialize();
check_selection(); check_selection();
ImVec2 min_window_size = m_gui_cfg->draw_advanced ? ImVec2 min_window_size = m_gui_cfg->draw_advanced ?
@ -387,7 +387,22 @@ void GLGizmoEmboss::initialize()
m_gui_cfg->text_size = ImVec2(-FLT_MIN, ImGui::GetTextLineHeight() * m_gui_cfg->text_size = ImVec2(-FLT_MIN, ImGui::GetTextLineHeight() *
m_gui_cfg->count_line_of_text); m_gui_cfg->count_line_of_text);
m_gui_cfg->advanced_input_width = ImGui::CalcTextSize("M").x * 6; ImVec2 letter_m_size = ImGui::CalcTextSize("M");
m_gui_cfg->advanced_input_width = letter_m_size.x * 6;
// calculate window size
const ImGuiStyle &style = ImGui::GetStyle();
float input_height = letter_m_size.y + style.FramePadding.y * 2.f;
float window_width = m_gui_cfg->combo_font_width + style.WindowPadding.x * 2.f;
float window_height = input_height * 4.f + // header + combo font + advance + button
style.ItemSpacing.y * 3.f +
m_gui_cfg->text_size.y +
style.WindowPadding.y * 2.f;
m_gui_cfg->minimal_window_size = ImVec2(window_width, window_height);
float advance_height = (input_height + style.ItemSpacing.y) * 4.f;
m_gui_cfg->minimal_window_size_with_advance =
ImVec2(window_width, window_height + advance_height);
// TODO: What to do when icon was NOT loaded? // TODO: What to do when icon was NOT loaded?
bool success = init_icons(); bool success = init_icons();

4
src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
View File

@ -92,13 +92,13 @@ private:
int max_imgui_font_size = 60; int max_imgui_font_size = 60;
bool draw_advanced = false; bool draw_advanced = false;
ImVec2 minimal_window_size = ImVec2(174, 202);
ImVec2 minimal_window_size_with_advance = ImVec2(174, 302);
// setted only when wanted to use - not all the time // setted only when wanted to use - not all the time
std::optional<ImVec2> offset; std::optional<ImVec2> offset;
// Zero means it is calculated in init function // Zero means it is calculated in init function
ImVec2 minimal_window_size = ImVec2(0, 0);
ImVec2 minimal_window_size_with_advance = ImVec2(0, 0);
float advanced_input_width = 0.f; float advanced_input_width = 0.f;
float combo_font_width = 0.f; float combo_font_width = 0.f;
float rename_pos_x = 0.f; float rename_pos_x = 0.f;