Commit graph

6626 commits

Author SHA1 Message Date
John Lewin
63894551f9 Fix null reference on PopupContent object
- Make base explicitly call to virtual function after content load
- Remove debugging color, switch back to expected - White
2017-06-12 18:00:51 -07:00
John Lewin
39e8d67327 Settings sidebar defaults to collapsed, tune library sidebar width 2017-06-12 18:00:51 -07:00
johnlewin
26091a26cb Merge pull request #2160 from larsbrubaker/design_tools
Made the docked tab control have the pin in its tab bar.
2017-06-12 18:00:21 -07:00
Lars Brubaker
9a655142f5 Made the docked tab control have the pin in its tab bar. 2017-06-12 17:55:32 -07:00
johnlewin
ff67bd4cf2 Merge pull request #2159 from larsbrubaker/design_tools
Moved tab controls into printer
2017-06-12 17:23:12 -07:00
Lars Brubaker
04a486044d Moved tab controls into printer
Put terminal into tab controls
2017-06-12 16:51:17 -07:00
Lars Brubaker
6a375eda7e Merge pull request #2158 from jlewin/design_tools
Revise Spitter and PopupWidget
2017-06-12 14:26:37 -07:00
John Lewin
f34a4db86f Revise Spitter and PopupWidget 2017-06-12 14:19:04 -07:00
Lars Brubaker
923e324472 Merge pull request #2157 from larsbrubaker/design_tools
Improved dock control
2017-06-12 10:23:48 -07:00
Lars Brubaker
9bc7b0a2b9 A bit better. 2017-06-12 10:08:13 -07:00
Lars Brubaker
9c8530492b Improved dock control 2017-06-12 10:01:50 -07:00
Lars Brubaker
38f74faa18 Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools
# Conflicts:
#	PartPreviewWindow/OverflowDropdown.cs
#	Submodules/agg-sharp
2017-06-12 09:32:45 -07:00
johnlewin
54f4021382 Merge pull request #2156 from jlewin/design_tools
Restore Library search functionality
2017-06-11 17:11:50 -07:00
John Lewin
dc3e02d6fd Drop QueueSelectCheckBoxWorks for ClickOnLibraryCheckBoxes 2017-06-11 16:45:36 -07:00
John Lewin
fd170070cf Reset to original container before search on ClearSearch() 2017-06-11 16:45:34 -07:00
John Lewin
0a3042dd45 Restore Library search functionality
- Reuse new CreateSmallResetButton helper
2017-06-11 16:45:31 -07:00
John Lewin
e8dca6d34e Extract and consolidate reset button generators to ThemeConfig 2017-06-11 16:45:30 -07:00
John Lewin
fda1cbd457 Remove enterEditModeButton 2017-06-11 16:45:28 -07:00
johnlewin
da39ca18f9 Merge pull request #2154 from larsbrubaker/design_tools
Added in first pass at pinned control
2017-06-11 16:45:01 -07:00
larsbrubaker
712de9a3a3 Added in first pass at pinned control 2017-06-11 15:17:25 -07:00
Lars Brubaker
d3cccf8616 Merge pull request #2153 from larsbrubaker/design_tools
Improved docking control
2017-06-11 11:41:37 -07:00
larsbrubaker
d25a7377e4 Merge remote-tracking branch 'origin/design_tools' into design_tools 2017-06-11 10:21:32 -07:00
larsbrubaker
669e05b140 Improved docking control 2017-06-11 10:14:32 -07:00
Lars Brubaker
46832ab359 Merge pull request #2152 from jlewin/design_tools
Revise emulator tests
2017-06-11 10:12:07 -07:00
John Lewin
b1842e58fe Explicitly close MatterControl on test conclusion 2017-06-11 09:58:25 -07:00
John Lewin
ca641f8b13 Ensure Dispose is called on Emulator instance 2017-06-11 09:52:30 -07:00
John Lewin
c4b2e88921 Add Emulator test category 2017-06-11 07:59:13 -07:00
larsbrubaker
16a7cb6807 Made the text render down on DockingTab 2017-06-10 21:17:43 -07:00
larsbrubaker
3dc2e09637 A fun and hacky start at docking control. 2017-06-10 18:40:57 -07:00
Lars Brubaker
ebd9d02013 Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools 2017-06-10 12:58:48 -07:00
Lars Brubaker
d41e334c94 I vertex source extension method 2017-06-10 12:58:26 -07:00
Lars Brubaker
2574660c3c Make sure we can open menu even if it contains something like a text widget. 2017-06-10 12:57:40 -07:00
johnlewin
1ff510d5bb Merge pull request #2151 from jlewin/design_tools
Prevent SliceSettings changes from spinning up MatterControl
2017-06-10 12:02:59 -07:00
John Lewin
9a46a5cd22 Prevent SliceSettings changes from spinning up MatterControl
- Use event to signal MaterialChanged
- Register MaterialChanged listeners on MatterControl startup
2017-06-10 11:24:21 -07:00
johnlewin
7126e1c9fa Merge pull request #2149 from jlewin/design_tools
Revise PrinterNameChangePersists test, fix blocking test issue
2017-06-09 20:35:53 -07:00
John Lewin
2f6afbb6ae Revise PrinterNameChangePersists test, fix blocking test issue
- Test helper should auto open SliceSettings overflow menu
- Fix product bug with null settingsLevel
2017-06-09 20:12:25 -07:00
Lars Brubaker
ca1c888e61 Merge pull request #2148 from larsbrubaker/design_tools
Making view use a splitter
2017-06-09 15:03:55 -07:00
Lars Brubaker
04b8088b4a Making view use a splitter 2017-06-09 14:42:26 -07:00
Lars Brubaker
356b4c8151 Merge pull request #2147 from larsbrubaker/design_tools
Improved 3D line rendering
2017-06-09 09:27:40 -07:00
Lars Brubaker
9bc02823af Improved 3D line rendering 2017-06-09 09:24:31 -07:00
Lars Brubaker
1e527e7dd4 Merge pull request #2145 from jlewin/design_tools
Consolidate scene operations into single class, improve naming
2017-06-09 09:22:25 -07:00
John Lewin
9021f918a5 Remove partial View3DWidget class wrapper 2017-06-09 08:16:46 -07:00
John Lewin
05b9b52190 Make DeleteSelection into a Scene extension method 2017-06-09 08:13:09 -07:00
John Lewin
375dc9e12a Make DuplicateSelection into a Scene extension method 2017-06-09 08:09:53 -07:00
John Lewin
e4d00c8948 Make AutoArrangeChildren into a Scene extension method 2017-06-09 08:05:01 -07:00
John Lewin
9fd2ee08c9 Make GroupSelection into a Scene extension method 2017-06-09 07:59:59 -07:00
John Lewin
058cc565f3 Make AlignToSelection into a Scene extension method 2017-06-09 07:56:48 -07:00
John Lewin
5a5db8de83 Make UngroupSelection into a Scene extension method 2017-06-09 07:49:45 -07:00
John Lewin
ef9982cdc5 Move AlignSelected() body into AlignToSelection() 2017-06-09 07:37:46 -07:00
John Lewin
1ade968db3 AlignToSelectedMeshGroup -> AlignToSelection 2017-06-09 07:34:06 -07:00