ed0f3b3406
Small refactoring
2020-03-25 13:55:17 +01:00
de06c5d659
Merge remote-tracking branch 'origin/ys_fix_cb_selection'
2020-03-25 11:12:37 +01:00
10eb954c7e
ENABLE_AUTO_CONSTRAINED_CAMERA set as default
2020-03-25 10:24:52 +01:00
3d6c9e54e9
ENABLE_THUMBNAIL_GENERATOR set as default
2020-03-25 10:15:02 +01:00
fac28ea27a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes
2020-03-25 09:34:17 +01:00
3990598f01
Fixed build when ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX is disabled
2020-03-25 09:33:59 +01:00
df8def7545
Fixed build when ENABLE_CANVAS_TOOLTIP_USING_IMGUI is disabled
2020-03-25 09:22:37 +01:00
c300b66b7e
ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 09:05:35 +01:00
69ca14a695
ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:52:57 +01:00
6f1c99db34
ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:43:18 +01:00
36041ced26
ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:31:15 +01:00
97b9de47b4
Merge branch 'master' into dev
2020-03-24 21:51:05 +01:00
c6d5ad1517
Refactoring of toolbars' tooltip generation
2020-03-24 12:26:30 +01:00
5215b2ecb2
Fix of #3889
2020-03-23 22:47:35 +01:00
c480041487
Close undo/redo windows when an item in the list is selected
2020-03-23 16:00:56 +01:00
b8c4369c4f
ImGui upgraded to version 1.75 + fixes required by upgrade
2020-03-23 12:41:16 +01:00
92162d8fe5
Merge branch 'et_bug_fixes'
2020-03-20 17:19:46 +01:00
4938d5ab63
Fixed orientations of some 3D connexion axes when in the swapped YZ mode.
2020-03-20 17:19:20 +01:00
7c56cc9f22
Follow-up of f912fecad5 -> option to swap y/z axes extended to rotations
2020-03-20 16:13:08 +01:00
ec381c5854
Update of Settings in ObjectList from Tab::update() is suppressed, if Undo/Redo is not completed
2020-03-20 13:45:37 +01:00
f912fecad5
3DConnexion devices: added option to swap y/z translations
2020-03-20 13:09:42 +01:00
5b24a0fb91
Fixed conflicts after merge with master
2020-03-20 10:55:37 +01:00
b4a7822098
Fixed Command character on OSX in ImGUI
2020-03-19 16:10:16 +01:00
cd5154b8e1
Fixed tooltip reappering after leaving imgui dialog
2020-03-19 15:12:18 +01:00
5b3ca3e4b7
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-19 14:06:49 +01:00
2501cf64c0
Modified mouse events handling for gizmobar
...
The gizmobar was consuming the mouse up event preventing the gizmos to update their tooltip
The gizmobar was also consuming the mouse dragging event transforming a gizmo manipulation into a scene rotation
2020-03-19 14:05:49 +01:00
be2fd7164c
ImGUI characters for OSX keyboard keyboard modifiers are only contained
...
in the CJK fonts, not in the regular fonts. Load them from CJK fonts
even for non CJK languages.
2020-03-19 13:32:34 +01:00
966b2ce371
Fixing spurious deselection of objects when switching from 3d path
...
preview to plater using the bottom tool bar & left mouse click.
This is result of the recent commits refactoring the mouse focus
over toolbars handling. 739d8131ab
2020-03-19 12:39:25 +01:00
6d23c08d00
WIP
2020-03-19 12:04:05 +01:00
f275461354
WIP: FDM supports gizmo now works with multiple part objects into some extent
2020-03-19 11:15:17 +01:00
1b05ecae8c
WIP: FDM gizmo: triangles not facing the camera are no more selected with fdm selection tool
2020-03-19 11:15:17 +01:00
590569e8f6
WIP: Optimized the triangle selection so it does not iterate over all the triangles
2020-03-19 11:15:17 +01:00
2e71dcefc3
WIP: Added a circle cursor and naive logic to select triangles inside
...
Deselection is possible when holding shift
Triangles obscured by the mesh are selected nonetheless (so far)
2020-03-19 11:15:17 +01:00
08daddb5de
WIP: First working implementation of the triangle selector for the FDM support gizmo
2020-03-19 11:15:17 +01:00
7afe7326b6
WIP: Duplicated the SLA gizmo for the FDM, removed what was not needed
...
Clipping plane and the m_model_object pointer keeping was duplicated
2020-03-19 11:15:17 +01:00
8f762168ba
Adding special OS characters for keyboard shortcuts to ImGUI font map.
2020-03-19 09:52:24 +01:00
739d8131ab
Modified mouse events handling for toolbar
...
The toolbar was consuming the mouse up event preventing the gizmos to update their tooltip
2020-03-18 16:59:30 +01:00
a901b17d33
Merge branch 'et_gizmos_tooltip' of https://github.com/Prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 14:28:54 +01:00
79951630ec
Hiding the tooltip when the window gets deactivated and reactivated.
2020-03-18 14:28:43 +01:00
9da16aeaa9
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 14:27:02 +01:00
61f3b53ef8
Fixed conflicts after merge with master
2020-03-18 14:26:44 +01:00
cd55b235ad
Canvas tooltip constrained inside canvas
2020-03-18 14:13:50 +01:00
37be82c8aa
Tooltips are rendered unformatted so percent signs in them do not break rendering
2020-03-18 13:50:08 +01:00
c5552843ab
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 13:36:01 +01:00
8a824bb8c2
Refactoring
2020-03-18 13:35:46 +01:00
067e128651
Suppress tooltips when the mouse is processed by an ImGUI dialog.
2020-03-18 13:23:07 +01:00
1c1a6b933a
Fixed interference between tooltips and imgui dialogs
2020-03-18 10:46:46 +01:00
a85a2b2e2a
Attempt to fix build on Linux
2020-03-17 15:47:49 +01:00
166389e6a8
Initial delay for ImGUI-based tooltip
2020-03-17 14:35:56 +01:00
7a1fa3d847
Canvas' tooltip using ImGUI
2020-03-17 13:01:38 +01:00
