Commit Graph

1021 Commits

Author SHA1 Message Date
Lukas Matena
c30e227eaa Merge branch 'master' into lm_fdm_custom_supports_polishing 2020-05-05 13:46:01 +02:00
bubnikv
1141732404 Fixed spelling of "sidebar" 2020-04-29 15:58:57 +02:00
YuSanka
1e6fdf6d80 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-29 14:56:31 +02:00
Lukas Matena
201dbbd64d Selection rectangle is supressed when FDM custom supports gizmo is active 2020-04-29 13:36:11 +02:00
YuSanka
a0ef2a3cdb Implemented workaround for the mouse wheel in Search Window and Undo/Redo lists on the Plater
Workaround is used because of ImGui::GetIO().MouseWheel returns zero always!
2020-04-27 16:00:54 +02:00
YuSanka
0be8b66746 Fixed update(clear) of the search_line, when search dialog was opened and closed without changing 2020-04-27 11:51:17 +02:00
Lukas Matena
0709d361d1 Merge branch 'lm_fdm_custom_supports_backend' 2020-04-24 15:16:33 +02:00
YuSanka
bc45c3bffa Fix to the last commit f9b3f2d45e 2020-04-24 11:33:00 +02:00
YuSanka
4674cec006 Search: Code cleaning
+ Reverted "Plater" tab to the Settings Notepad
2020-04-24 11:01:14 +02:00
YuSanka
58bbe6e0d2 Collapse_toolbar: fixed draw items
+ Extended toolbar
2020-04-23 21:00:00 +02:00
YuSanka
7805778ab8 First implementation of the separate plater from the settings tabs
+ Added collapse_toolbar
2020-04-23 17:11:49 +02:00
YuSanka
2b3b8e85d9 Search: Implemented "Option type" checkbox for imGui window on Plater
+ code refactoring
2020-04-20 21:54:46 +02:00
YuSanka
372dcb582b Search: Implemented cursor movement inside SearchWindow on Plater 2020-04-20 17:37:03 +02:00
Lukas Matena
3c968b9535 Fixed a crash in the FDM supports gizmo when the wipe tower was shown
The crash happened during showing/hiding of volumes, which historically assumed to always run in SLA mode and so did not expect to encounter the wipe tower.
2020-04-20 09:17:48 +02:00
YuSanka
d52e4c21d5 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-16 11:46:29 +02:00
YuSanka
5996e3a0ec Implemented cursor movement inside SearchComboPopup
+ Added checkboxes for editing of the option's name (include "Group"/"Category" or not)
+ some code refactoring
2020-04-14 17:54:15 +02:00
Lukas Matena
319e74d4ce The bed texture is not shown when looking from below and FDM/SLA support gizmo is active 2020-04-14 13:18:08 +02:00
YuSanka
29ac9752b4 Added map for save Group and Category values for each option
+ Some code refactoring in Tab (the translation of the titles moved to the OptionGroups) and Search
+ Fixed assert in fts_fuzzy_match
2020-04-13 17:55:38 +02:00
YuSanka
5fbc5e6c5a Search: Set focus on search line in popup control on Plater 2020-04-08 21:03:58 +02:00
YuSanka
8e640df815 Search: Added shortkey Ctrl+F on Plater 2020-04-08 09:47:33 +02:00
Lukas Matena
c39bcd8afe Merge branch 'lm_gizmos' into lm_fdm_supports_gizmo 2020-04-07 17:16:48 +02:00
Lukas Matena
5994d8a92e Removed obsolete code
Got rid of dummy header GLGizmos.hpp
2020-04-07 16:47:39 +02:00
YuSanka
31baca7bf5 Implemented SearchCtrl class instead of SearchComboBox
Search string are synchronized between Plater and Tabs.

List with options and filtered list are in Sidebar.
All options list on tabs and Plater use this data from Sidebar

Note: SearchComboBox.cpp(hpp) was renamed to Search.cpp(hpp)
2020-04-03 10:27:50 +02:00
YuSanka
28f609d4ce Merge remote-tracking branch 'origin/master' into ys_search 2020-04-01 20:23:34 +02:00
YuSanka
e294eac44b Added code for deactivating of search toolbar item
+ invalidated its unused callbacks.

 + ImGui::Selectable function is copied to InGuiWrapper.cpp and a little beat modified to change a label text, when item is hovered
2020-04-01 15:28:07 +02:00
enricoturri1966
70da70cc9c Fixed conflicts after merge with master 2020-04-01 15:06:30 +02:00
enricoturri1966
6026ae7d9f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-31 18:05:12 +02:00
enricoturri1966
76a117ce75 Fixed build when tech ENABLE_NON_STATIC_CANVAS_MANAGER is disabled 2020-03-31 18:04:49 +02:00
Enrico Turri
8422b56faf Follow-up of 095062e371 -> 3DConnexion settings dialog (Ctrl+M) shown only on Linux (not Mac) 2020-03-31 15:30:24 +02:00
Enrico Turri
1a872f769b 3DConnexion settings dialog (Ctrl+M) shown only on Mac 2020-03-31 14:16:53 +02:00
YuSanka
51fd24168d Added new icon for "collapse sidebar"
+ The tooltip for a "Collapse" button is updated according to the collapse state
2020-03-30 11:53:58 +02:00
YuSanka
00a6c43c9a Activated "collapsed sidebar" button 2020-03-29 20:52:14 +02:00
YuSanka
0b372d4fd5 Merge remote-tracking branch 'origin/master' into ys_search 2020-03-29 20:21:00 +02:00
YuSanka
8b0ae2ce18 Implemented Search on Plater, usint imGui 2020-03-28 19:39:24 +01:00
Lukas Matena
563200dd18 Fix of #3916 (macOS crash when generating WarningTexture)
Likely the same cause as #3371, hopefully the same solution as presented in 4f1f507
2020-03-25 23:55:25 +01:00
bubnikv
7f866ee9e8 Merge remote-tracking branch 'remotes/origin/et_slope_shader' 2020-03-25 16:09:04 +01:00
enricoturri1966
11acd7d7e4 Follow-up of bfbcd45209 -> completed fix 2020-03-25 15:30:25 +01:00
enricoturri1966
2fe5dbc5bb Fixed build on Mac 2020-03-25 15:15:20 +01:00
enricoturri1966
ea0b2c2be4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-25 14:54:10 +01:00
enricoturri1966
78a0893d6a Fixed conflicts after merge with master 2020-03-25 14:41:47 +01:00
bubnikv
7769f9740b 64bit coord_t
Vec3i as a vertex index to TriangleMesh constructor
2020-03-25 14:35:41 +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
208ffc85ad Fixed build when ENABLE_CANVAS_TOOLTIP_USING_IMGUI is disabled 2020-03-25 09:22:37 +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
enricoturri1966
e43b796031 Close undo/redo windows when an item in the list is selected 2020-03-23 16:00:56 +01:00