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

Building with new typography update

Browse source 
fixed a bug with dragging
This commit is contained in:
Lars Brubaker 2018-09-25 18:00:19 -07:00
parent ff788063f2
commit 06c5224bb4
3 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

41
MatterControl.sln
View file

@ -78,10 +78,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.OpenGL", "Mat
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.Printing", "MatterControl.Printing\MatterControl.Printing.csproj", "{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.GlyphLayout", "Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.csproj", "{DE958333-2467-409D-904D-92C9CCD0BA52}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.OpenFont", "Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.csproj", "{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterHackers.VeldridProvider", "Submodules\agg-sharp\Veldrid\MatterHackers.VeldridProvider.csproj", "{676EB09F-8913-49A4-AB85-5DA45506AB3D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.Winforms", "MatterControl.Winforms\MatterControl.Winforms.csproj", "{D6DC2669-7B1F-40FE-89BF-45D4C94473E3}"
@ -94,10 +90,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControlLib", "MatterC
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterControl.csproj", "{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Typography.GlyphLayout", "Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.shproj", "{D8861CF8-C506-472B-8A57-632BD6CA6496}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.One", "Submodules\agg-sharp\Typography.One\Typography.One.csproj", "{07F53C22-F178-4A25-963F-11DB59024ACA}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Typography.OpenFont", "Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.shproj", "{235A071B-8D06-40AE-A5C5-B1CE59715EE9}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.projitems*{235a071b-8d06-40ae-a5c5-b1ce59715ee9}*SharedItemsImports = 13
Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4
Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4
Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{d8861cf8-c506-472b-8a57-632bd6ca6496}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -354,22 +358,6 @@ Global
{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}.Release|Any CPU.Build.0 = Release|Any CPU
{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{DE958333-2467-409D-904D-92C9CCD0BA52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE958333-2467-409D-904D-92C9CCD0BA52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE958333-2467-409D-904D-92C9CCD0BA52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{DE958333-2467-409D-904D-92C9CCD0BA52}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{DE958333-2467-409D-904D-92C9CCD0BA52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE958333-2467-409D-904D-92C9CCD0BA52}.Release|Any CPU.Build.0 = Release|Any CPU
{DE958333-2467-409D-904D-92C9CCD0BA52}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{DE958333-2467-409D-904D-92C9CCD0BA52}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Any CPU.Build.0 = Release|Any CPU
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{676EB09F-8913-49A4-AB85-5DA45506AB3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{676EB09F-8913-49A4-AB85-5DA45506AB3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{676EB09F-8913-49A4-AB85-5DA45506AB3D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@ -418,6 +406,14 @@ Global
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Any CPU.Build.0 = Release|Any CPU
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{07F53C22-F178-4A25-963F-11DB59024ACA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07F53C22-F178-4A25-963F-11DB59024ACA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07F53C22-F178-4A25-963F-11DB59024ACA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{07F53C22-F178-4A25-963F-11DB59024ACA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{07F53C22-F178-4A25-963F-11DB59024ACA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07F53C22-F178-4A25-963F-11DB59024ACA}.Release|Any CPU.Build.0 = Release|Any CPU
{07F53C22-F178-4A25-963F-11DB59024ACA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{07F53C22-F178-4A25-963F-11DB59024ACA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -454,12 +450,13 @@ Global
{1A901129-C885-425F-8D4B-86698F98A2B4} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{CBDEEC31-D688-417B-9BF2-F0DB2E4FB268} = {FED00F38-E911-45E1-A788-26980E84C3D6}
{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F} = {FED00F38-E911-45E1-A788-26980E84C3D6}
{DE958333-2467-409D-904D-92C9CCD0BA52} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{676EB09F-8913-49A4-AB85-5DA45506AB3D} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{D6DC2669-7B1F-40FE-89BF-45D4C94473E3} = {FED00F38-E911-45E1-A788-26980E84C3D6}
{7F077116-2923-4A77-87CC-EC3BE7EB8BC3} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
{B0AED568-8796-42B9-BAA9-EBC796134E78} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
{D8861CF8-C506-472B-8A57-632BD6CA6496} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{07F53C22-F178-4A25-963F-11DB59024ACA} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{235A071B-8D06-40AE-A5C5-B1CE59715EE9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {42D74E06-00EA-43D2-A05B-9BEAD4A2C8A0}

3
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -516,7 +516,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
IObject3D selectedItem = Scene.SelectedItem;
// Move the object being dragged
if (this.DragOperationActive
&& this.DragDropObject != null)
&& this.DragDropObject != null
&& selectedItem != null)
{
// Move the DropDropObject the target item
DragSelectedObject(selectedItem, localMousePosition: this.TransformFromParentSpace(topMostParent, screenSpaceMousePosition));

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit ef744d114990dfbbc3733ed05a738c73a31c174b
Subproject commit ccee7f632ea5635d79a3fd21f159afe1f07e14f9