mirror of
https://github.com/greenshot/greenshot.git
synced 2025-03-12 05:25:25 -07:00
Updated dependencies [skip ci]
This commit is contained in:
Robin Krom
parent
509daf5982
commit
05fc4a6ce2
src
Greenshot.Addon.Imgur
Greenshot.Addon.InternetExplorer
Greenshot.Addon.Lutim
Greenshot.Addon.Tfs
Greenshot.Addon.Win10
Greenshot.Addons
Greenshot.Core
Greenshot.Gfx
Greenshot.Tests
Greenshot
@ -23,6 +23,6 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0455" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
@ -6,7 +6,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Windows.Com" Version="0.9.5" />
|
||||
<PackageReference Include="Dapplo.Windows.Com" Version="0.9.7" />
|
||||
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@ -23,6 +23,6 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0455" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -22,6 +22,6 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0455" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -1,91 +0,0 @@
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2019 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
using Greenshot.Addons.Interfaces;
|
||||
using Microsoft.Toolkit.Forms.UI.XamlHost;
|
||||
|
||||
namespace Greenshot.Addon.Win10
|
||||
{
|
||||
public class Win10FormEnhancer : IFormEnhancer
|
||||
{
|
||||
private WindowsXamlHost _inkCanvasHost;
|
||||
private WindowsXamlHost _inkToolbarHost;
|
||||
private Windows.UI.Xaml.Controls.InkCanvas _inkCanvas;
|
||||
private Windows.UI.Xaml.Controls.InkToolbar _inkToolbar;
|
||||
|
||||
public void InitializeComponent(Form target)
|
||||
{
|
||||
if (target is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
// InkCanvas
|
||||
_inkCanvasHost = new WindowsXamlHost
|
||||
{
|
||||
InitialTypeName = "Windows.UI.Xaml.Controls.InkCanvas",
|
||||
Dock = DockStyle.Fill,
|
||||
BackColor = Color.Transparent,
|
||||
|
||||
};
|
||||
_inkCanvasHost.ChildChanged += InkCanvas_ChildChanged;
|
||||
|
||||
// InkToolbar
|
||||
_inkToolbarHost = new WindowsXamlHost
|
||||
{
|
||||
InitialTypeName = "Windows.UI.Xaml.Controls.InkToolbar",
|
||||
// Layout
|
||||
Top = 0,
|
||||
Left = 0,
|
||||
Height = 50,
|
||||
Dock = DockStyle.Top,
|
||||
BackColor = Color.Transparent
|
||||
};
|
||||
_inkToolbarHost.ChildChanged += InkToolbar_ChildChanged;
|
||||
|
||||
// Add to Window
|
||||
target.Controls.Add(_inkToolbarHost);
|
||||
target.Controls.Add(_inkCanvasHost);
|
||||
}
|
||||
|
||||
private void InkToolbar_ChildChanged(object sender, EventArgs e)
|
||||
{
|
||||
_inkToolbar = ((WindowsXamlHost)sender).Child as Windows.UI.Xaml.Controls.InkToolbar;
|
||||
InitializeUwpControls();
|
||||
}
|
||||
|
||||
private void InkCanvas_ChildChanged(object sender, EventArgs e)
|
||||
{
|
||||
_inkCanvas = ((WindowsXamlHost)sender).Child as Windows.UI.Xaml.Controls.InkCanvas;
|
||||
InitializeUwpControls();
|
||||
}
|
||||
|
||||
private void InitializeUwpControls()
|
||||
{
|
||||
if (_inkToolbar == null || _inkCanvas == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_inkToolbar.TargetInkCanvas = _inkCanvas;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -23,12 +23,12 @@
|
||||
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.24" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.24" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.24" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.9.5" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.9.5" />
|
||||
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.9.5" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.9.5" />
|
||||
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.3" />
|
||||
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0188" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.9.7" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.9.7" />
|
||||
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.9.7" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.9.7" />
|
||||
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.4" />
|
||||
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0189" />
|
||||
<PackageReference Include="Svg" Version="2.4.3" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
@ -6,7 +6,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.9.5" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.9.7" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
@ -8,8 +8,8 @@
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Addons" Version="1.2.17" />
|
||||
<PackageReference Include="Dapplo.Log" Version="1.3.21" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.9.5" />
|
||||
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.9.5" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.9.7" />
|
||||
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.9.7" />
|
||||
<PackageReference Include="Svg" Version="2.4.3" />
|
||||
<PackageReference Include="System.Memory" Version="4.5.3" />
|
||||
</ItemGroup>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
@ -31,7 +31,7 @@
|
||||
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
|
||||
<PackageReference Include="CommandLineParser" Version="2.5.0" />
|
||||
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.21" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.9.5" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.9.7" />
|
||||
<PackageReference Include="xunit" Version="2.4.1" />
|
||||
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
|
||||
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
|
||||
|
||||
@ -38,8 +38,8 @@
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="2.0.2" />
|
||||
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.21" />
|
||||
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.21" />
|
||||
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.9.5" />
|
||||
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.3" />
|
||||
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.9.7" />
|
||||
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.4" />
|
||||
<PackageReference Include="Svg" Version="2.4.3" />
|
||||
<TrimmerRootAssembly Include="System.Diagnostics.Debug" />
|
||||
</ItemGroup>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user