YuSanka
007c65dcc4
Merge remote-tracking branch 'origin/ys_fix_cb_selection'
2020-03-25 11:12:37 +01:00
enricoturri1966
418618cad9
ENABLE_AUTO_CONSTRAINED_CAMERA set as default
2020-03-25 10:24:52 +01:00
enricoturri1966
16e1cd5d19
ENABLE_THUMBNAIL_GENERATOR set as default
2020-03-25 10:15:02 +01:00
enricoturri1966
c5ed253b1b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes
2020-03-25 09:34:17 +01:00
enricoturri1966
ca652035bf
Fixed build when ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX is disabled
2020-03-25 09:33:59 +01:00
enricoturri1966
208ffc85ad
Fixed build when ENABLE_CANVAS_TOOLTIP_USING_IMGUI is disabled
2020-03-25 09:22:37 +01:00
enricoturri1966
63f16adafb
ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 09:05:35 +01:00
enricoturri1966
92a815b06f
ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:52:57 +01:00
enricoturri1966
70439b4cf8
ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:43:18 +01:00
enricoturri1966
92f49ef32c
ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:31:15 +01:00
Lukas Matena
ac501bdf8b
Merge branch 'master' into dev
2020-03-24 21:51:05 +01:00
enricoturri1966
c8bffb7f2a
Refactoring of toolbars' tooltip generation
2020-03-24 12:26:30 +01:00
YuSanka
dd29817ef9
Fix of #3889
2020-03-23 22:47:35 +01:00
enricoturri1966
e43b796031
Close undo/redo windows when an item in the list is selected
2020-03-23 16:00:56 +01:00
enricoturri1966
d194d4ba35
ImGui upgraded to version 1.75 + fixes required by upgrade
2020-03-23 12:41:16 +01:00
bubnikv
fb6400c596
Merge branch 'et_bug_fixes'
2020-03-20 17:19:46 +01:00
bubnikv
8f392f9ec3
Fixed orientations of some 3D connexion axes when in the swapped YZ mode.
2020-03-20 17:19:20 +01:00
Enrico Turri
88b761c71c
Follow-up of f912fecad5 -> option to swap y/z axes extended to rotations
2020-03-20 16:13:08 +01:00
YuSanka
155ec1daec
Update of Settings in ObjectList from Tab::update() is suppressed, if Undo/Redo is not completed
2020-03-20 13:45:37 +01:00
Enrico Turri
de99fd4d71
3DConnexion devices: added option to swap y/z translations
2020-03-20 13:09:42 +01:00
Slic3rPE
247b9bb38f
Fixed Command character on OSX in ImGUI
2020-03-19 16:10:16 +01:00
enricoturri1966
7e1189ce92
Fixed tooltip reappering after leaving imgui dialog
2020-03-19 15:12:18 +01:00
enricoturri1966
ad3a504a3f
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-19 14:06:49 +01:00
enricoturri1966
a6d47d15fd
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
bubnikv
c31c9bd32b
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
bubnikv
2ba86fcc2b
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
bubnikv
a56d48b277
Adding special OS characters for keyboard shortcuts to ImGUI font map.
2020-03-19 09:52:24 +01:00
enricoturri1966
cf53ca27cb
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
bubnikv
90df0aa04a
Merge branch 'et_gizmos_tooltip' of https://github.com/Prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 14:28:54 +01:00
bubnikv
262cc4aea9
Hiding the tooltip when the window gets deactivated and reactivated.
2020-03-18 14:28:43 +01:00
enricoturri1966
5260158e92
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 14:27:02 +01:00
enricoturri1966
1dc94927a9
Fixed conflicts after merge with master
2020-03-18 14:26:44 +01:00
enricoturri1966
5cbafd9fcc
Canvas tooltip constrained inside canvas
2020-03-18 14:13:50 +01:00
Lukas Matena
8f219e8e81
Tooltips are rendered unformatted so percent signs in them do not break rendering
2020-03-18 13:50:08 +01:00
enricoturri1966
bbd5c00ea2
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 13:36:01 +01:00
enricoturri1966
5e58272af1
Refactoring
2020-03-18 13:35:46 +01:00
bubnikv
9dedecbecd
Suppress tooltips when the mouse is processed by an ImGUI dialog.
2020-03-18 13:23:07 +01:00
enricoturri1966
6d9ec8f7a1
Fixed interference between tooltips and imgui dialogs
2020-03-18 10:46:46 +01:00
enricoturri1966
ce896e7ca7
Attempt to fix build on Linux
2020-03-17 15:47:49 +01:00
enricoturri1966
a4c476c97a
Initial delay for ImGUI-based tooltip
2020-03-17 14:35:56 +01:00
enricoturri1966
57526d5fd3
Canvas' tooltip using ImGUI
2020-03-17 13:01:38 +01:00
enricoturri1966
0700dc5cff
Attempt to fix gizmos tooltip on Mac
2020-03-17 11:02:32 +01:00
enricoturri1966
566ec6d9bd
Fixed gizmos' tooltips
2020-03-17 09:41:54 +01:00
YuSanka
254814d6e5
Fix of #3303
...
+ Fixed wrong update of selection in object and scene, when change selection in ObjectList after editing of values in Height range modifiers.
Repro:
1. Add 2 objects
2. Add Height range modifiers for one of them
3. Select range
4. Edit some of values
5. Select other object.
Expected behavior:
1. Edited value is saved
2. New object is selected in object list and on the 3D scene_selection
Real behavior:
1. New object is selected in object list and on the 3D scene_selection
But:
2. Every next selection in object list has no update on the scene or "temporary" panel
3. Selection from the scene updates selection in ObjectList
But:
4. Next editing of layer range and press "Enter" causes a crash
2020-03-16 21:32:48 +01:00
enricoturri1966
17d79211b3
Generate gizmos' tooltip on demand
2020-03-16 16:37:22 +01:00
bubnikv
84c1c019e1
Revert " #3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview"
...
It is too late before 2.2.0-final.
This reverts commit 350a85cf43 .
2020-03-16 14:25:05 +01:00
enricoturri1966
ecc94a0534
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2020-03-16 13:35:15 +01:00
enricoturri1966
c665354c70
#3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview
2020-03-16 13:34:53 +01:00
enricoturri1966
0eb46d09b9
Fixed gizmos' tooltips
2020-03-16 12:45:39 +01:00
bubnikv
87d08eb85c
Fix of
...
"Print settings reloaded with 0.05 layer and fill percentage changed
after click on modified profile #3755 "
Combo box callback was not removing the "(modified)" suffix.
2020-03-16 09:57:20 +01:00