3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add default value to optional input

Browse source 
Remove unnecessary addiction to canvas3d in imgui wrapper
This commit is contained in:
Filip Sykala 2022-03-02 14:32:22 +01:00
parent a000d12361
commit a0dde4651b
3 changed files with 62 additions and 51 deletions
src/slic3r/GUI/Gizmos
GLGizmoEmboss.cpp

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

@ -90,7 +90,9 @@ void GLGizmoEmboss::set_fine_position()
Polygon hull = CameraUtils::create_hull2d(camera, *volume);
const ImVec2 &windows_size = get_minimal_window_size();
ImVec2 offset = ImGuiWrapper::suggest_location(windows_size, hull);
Size c_size = m_parent.get_canvas_size();
ImVec2 canvas_size(c_size.get_width(), c_size.get_height());
ImVec2 offset = ImGuiWrapper::suggest_location(windows_size, hull, canvas_size);
m_set_window_offset = offset;
return;
@ -116,7 +118,9 @@ static void draw_fine_position(const Selection &selection)
Slic3r::Polygon hull = CameraUtils::create_hull2d(camera, *volume);
ImVec2 windows_size(174, 202);
ImVec2 offset = ImGuiWrapper::suggest_location(windows_size, hull);
Size c_size = m_parent.get_canvas_size();
ImVec2 canvas_size(c_size.get_width(), c_size.get_height());
ImVec2 offset = ImGuiWrapper::suggest_location(windows_size, hull,canvas_size);
Slic3r::Polygon rect(
{Point(offset.x, offset.y), Point(offset.x + windows_size.x, offset.y),
Point(offset.x + windows_size.x, offset.y + windows_size.y),