nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made the old align show its icon in the tree view

Browse source
This commit is contained in:
LarsBrubaker 2022-09-19 22:48:34 -07:00
parent a47576468c
commit ae38346b4d
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/ApplicationView/SceneOperations.cs
View file

@ -882,6 +882,9 @@ namespace MatterHackers.MatterControl
Icons.Add(typeof(SelectionGroupObject3D), groupIconSource);
}
// register legacy types so they still show, they don't have ui to create so they don't have icons set dynamically
Icons.Add(typeof(AlignObject3D), (theme) => StaticData.Instance.LoadIcon("align_left_dark.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply());
// image operations
PrimaryOperations.Add(typeof(ImageObject3D), new List<SceneOperation> { SceneOperations.ById("ImageConverter"), SceneOperations.ById("ImageToPath"), });
@ -919,7 +922,6 @@ namespace MatterHackers.MatterControl
PrimaryOperations.Add(typeof(Object3D), new List<SceneOperation> { SceneOperations.ById("Scale") });
Icons.Add(typeof(ImageObject3D), (theme) => StaticData.Instance.LoadIcon("image_converter.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply());
// Icons.Add(typeof(CubeObject3D), (theme) => StaticData.Instance.LoadIcon("image_converter.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply());
}
private static SceneOperation CombineOperation()

4
MatterControlLib/Library/ContentProviders/MeshContentProvider.cs
View file

@ -176,9 +176,9 @@ namespace MatterHackers.MatterControl
// TODO: Wire up limits for thumbnail generation. If content is too big, return null allowing the thumbnail to fall back to content default
object3D = await contentModel.CreateContent();
}
else if (libraryItem is ILibraryObject3D)
else if (libraryItem is ILibraryObject3D libraryObject3D)
{
object3D = await (libraryItem as ILibraryObject3D)?.GetObject3D(null);
object3D = await libraryObject3D.GetObject3D(null);
}
if (object3D == null)

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 8dd82c825266791e6d51461bdf4de83df238dc6e
Subproject commit 80691d427aed19ef7578efa573cf3f0fd08030ee