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

Replace Winforms single window mode with shared version

Browse source
This commit is contained in:
John Lewin 2018-10-02 08:12:44 -07:00
parent 45c603d076
commit e138b20d01
5 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MatterControl.Winforms/MatterControl.Winforms.csproj
View file

@ -53,6 +53,7 @@
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WindowsPlatformsFeatures.cs" />
<Compile Include="WinformsSingleWindowProvider.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MatterControlLib\MatterControlLib.csproj">

52
MatterControl.Winforms/WinformsSingleWindowProvider.cs Normal file
View file

@ -0,0 +1,52 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Agg.UI;
namespace MatterHackers.MatterControl
{
public class WinformsSingleWindowProvider : SingleWindowProvider
{
private OpenGLSystemWindow winform;
public override void ShowSystemWindow(SystemWindow systemWindow)
{
if (platformWindow == null)
{
winform = new OpenGLSystemWindow();
winform.WindowProvider = this;
WinformsSystemWindow.SingleWindowMode = true;
platformWindow = winform;
}
base.ShowSystemWindow(systemWindow);
}
}
}

11
MatterControlLib/CustomWidgets/SingleWindowProvider.cs
View file

@ -27,7 +27,6 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
using System.Linq;
using MatterHackers.Agg.Platform;
@ -37,13 +36,7 @@ using MatterHackers.MatterControl.PartPreviewWindow;
namespace MatterHackers.Agg.UI
{
public interface ISingleWindowProvider
{
IReadOnlyList<SystemWindow> openWindows { get; }
SystemWindow topWindow { get; }
}
public class SingleWindowProvider : ISystemWindowProvider, ISingleWindowProvider
public class SingleWindowProvider : ISystemWindowProvider
{
protected List<SystemWindow> _openWindows = new List<SystemWindow>();
protected IPlatformWindow platformWindow;
@ -141,8 +134,6 @@ namespace MatterHackers.Agg.UI
// Find and remove the WindowContainer from the openWindows list
_openWindows.Remove(systemWindow);
/////////// UiThread.RunOnIdle(this.Invalidate);
}
topWindow = _openWindows.LastOrDefault();

1
Program.cs
View file

@ -61,6 +61,7 @@ namespace MatterHackers.MatterControl
// Set default Agg providers
AggContext.Config.ProviderTypes.SystemWindow = "MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32";
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.WinformsSystemWindowProvider, agg_platform_win32";
//AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.MatterControl.WinformSingleWindowProvider, MatterControl.Winforms";
string userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit dcb530841def6a7f57f22a10628a84bfb86e26c7
Subproject commit ee564171c89fb6f552bf69cd3a3464073366b4c9