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

Collapse single use method into caller

Browse source
This commit is contained in:
John Lewin 2019-01-31 22:41:20 -08:00
parent ff7b8e40cf
commit 7293319e4e
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MatterControlLib/PartPreviewWindow/View3D/InteractionLayer.cs
View file

@ -112,7 +112,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (DoOpenGlDrawing)
{
GLHelper.SetGlContext(this.World, renderSource.TransformToScreenSpace(renderSource.LocalBounds), lighting);
OnDrawGlContent(e);
// OnDrawGlContent
DrawGlOpaqueContent?.Invoke(this, e);
this.Draw_GlTransparentContent(e);
GLHelper.UnsetGlContext();
}
}
@ -342,12 +346,5 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
public GuiWidget GuiSurface => this;
private void OnDrawGlContent(DrawEventArgs e)
{
DrawGlOpaqueContent?.Invoke(this, e);
this.Draw_GlTransparentContent(this, e);
}
}
}

2
MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -421,7 +421,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
private void Draw_GlTransparentContent(object sender, DrawEventArgs e)
private void Draw_GlTransparentContent(DrawEventArgs e)
{
var gcodeOptions = sceneContext.RendererOptions;