3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Measure: Fix measure window position

Browse source
This commit is contained in:
Noisyfox 2023-10-31 11:44:20 +08:00
parent f72d42f920
commit c31e1f5229
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View file

@ -1810,12 +1810,10 @@ void GLGizmoMeasure::on_render_input_window(float x, float y, float bottom_limit
if (m_editing_distance) if (m_editing_distance)
return; return;
m_imgui->begin(get_name(), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
// adjust window position to avoid overlap the view toolbar // adjust window position to avoid overlap the view toolbar
const float win_h = ImGui::GetWindowHeight(); const float win_h = ImGui::GetWindowHeight();
y = std::min(y, bottom_limit - win_h); y = std::min(y, bottom_limit - win_h);
ImGui::SetWindowPos(ImVec2(x, y), ImGuiCond_Always); GizmoImguiSetNextWIndowPos(x, y, ImGuiCond_Always, 0.0f, 0.0f);
if (last_h != win_h || last_y != y) { if (last_h != win_h || last_y != y) {
// ask canvas for another frame to render the window in the correct position // ask canvas for another frame to render the window in the correct position
m_imgui->set_requires_extra_frame(); m_imgui->set_requires_extra_frame();
@ -1825,6 +1823,8 @@ void GLGizmoMeasure::on_render_input_window(float x, float y, float bottom_limit
last_y = y; last_y = y;
} }
GizmoImguiBegin(get_name(), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
if (ImGui::BeginTable("Commands", 2)) { if (ImGui::BeginTable("Commands", 2)) {
unsigned int row_count = 1; unsigned int row_count = 1;
add_row_to_table( add_row_to_table(
@ -2114,7 +2114,7 @@ void GLGizmoMeasure::on_render_input_window(float x, float y, float bottom_limit
m_imgui->set_requires_extra_frame(); m_imgui->set_requires_extra_frame();
} }
m_imgui->end(); GizmoImguiEnd();
} }
void GLGizmoMeasure::on_register_raycasters_for_picking() void GLGizmoMeasure::on_register_raycasters_for_picking()