juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modal estimated printing time dialog

Browse Source 
Fixed conflicts after merge with master
This commit is contained in:
enricoturri1966
2020-07-27 14:53:17 +02:00
parent 8e679d8b75 18594261d2
commit 48ae8dc9a2
22 changed files with 1301 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/GUI/ImGuiWrapper.cpp
View File

@@ -182,6 +182,9 @@ bool ImGuiWrapper::update_mouse_data(wxMouseEvent& evt)
io.MouseDown[0] = evt.LeftIsDown();
io.MouseDown[1] = evt.RightIsDown();
io.MouseDown[2] = evt.MiddleIsDown();
float wheel_delta = static_cast<float>(evt.GetWheelDelta());
if (wheel_delta != 0.0f)
io.MouseWheel = static_cast<float>(evt.GetWheelRotation()) / wheel_delta;
unsigned buttons = (evt.LeftIsDown() ? 1 : 0) | (evt.RightIsDown() ? 2 : 0) | (evt.MiddleIsDown() ? 4 : 0);
m_mouse_buttons = buttons;