3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 10:17:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed labels auto-sizing

Browse source
This commit is contained in:
Enrico Turri 2020-02-06 12:06:39 +01:00
parent 00737948e6
commit 3981e25f75
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1362,8 +1362,7 @@ void GLCanvas3D::Labels::render(const std::vector<const PrintInstance*>& sorted_
} }
// force re-render while the windows gets to its final size (it takes several frames) // force re-render while the windows gets to its final size (it takes several frames)
float content_w = 1 + ImGui::GetWindowContentRegionWidth(); if (ImGui::GetWindowContentRegionWidth() + 2.0f * ImGui::GetStyle().WindowPadding.x != ImGui::CalcWindowExpectedSize(ImGui::GetCurrentWindow()).x)
if (content_w < label_len)
m_canvas.request_extra_frame(); m_canvas.request_extra_frame();
imgui.end(); imgui.end();

2
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -3905,6 +3905,8 @@ void ObjectList::OnEditingDone(wxDataViewEvent &event)
// Here the last active column is forgotten, so when leaving the editing mode, the next mouse click will not enter the editing mode of the newly selected column. // Here the last active column is forgotten, so when leaving the editing mode, the next mouse click will not enter the editing mode of the newly selected column.
m_last_selected_column = -1; m_last_selected_column = -1;
#endif //__WXMSW__ #endif //__WXMSW__
wxGetApp().plater()->set_current_canvas_as_dirty();
} }
void ObjectList::show_multi_selection_menu() void ObjectList::show_multi_selection_menu()