From 52ff444819c7e14e83078ce19b3ab6c20366209c Mon Sep 17 00:00:00 2001 From: Robin Date: Sat, 29 Sep 2018 21:01:17 +0200 Subject: [PATCH] Somehow there are some issues with adding package which have sub dependencies, they are not installed. --- .../Greenshot.Addon.InternetExplorer.csproj | 7 +++-- .../IECaptureHelper.cs | 2 +- .../Greenshot.Addon.LegacyEditor.csproj | 11 +++---- src/Greenshot.Addons/Greenshot.Addons.csproj | 26 ++++++++++++----- src/Greenshot.Core/Greenshot.Core.csproj | 7 ++++- src/Greenshot.Core/Sources/DwmWindowSource.cs | 2 +- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 5 +++- src/Greenshot/Greenshot.csproj | 29 +++++++++++-------- src/Greenshot/Helpers/CaptureHelper.cs | 4 +-- 9 files changed, 60 insertions(+), 33 deletions(-) diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj index 2cb1e2475..dd5940f08 100644 --- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj +++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj @@ -12,13 +12,14 @@ - 0.5.31 + 0.6.2 + - 0.5.112 + 0.6.6 - 0.5.112 + 0.6.6 diff --git a/src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs b/src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs index d7583933e..2ebca2386 100644 --- a/src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs +++ b/src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs @@ -387,7 +387,7 @@ namespace Greenshot.Addon.InternetExplorer { if (windowToCapture == null) { - windowToCapture = InteropWindowQuery.GetActiveWindow(); + windowToCapture = InteropWindowQuery.GetForegroundWindow(); } // Show backgroundform after retrieving the active window.. var backgroundForm = new BackgroundForm("Internet Explorer", "Please wait while the page in Internet Explorer is captured..."); diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index dabfbd6ff..5cf1108b4 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -30,19 +30,20 @@ 2.0.4 - 1.0.75 + 1.0.83 - 1.0.75 + 1.0.83 - 0.8.46 + 0.9.4 + - 0.5.112 + 0.6.6 - 0.5.112 + 0.6.6 \ No newline at end of file diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 08abaa2d5..b93fff73d 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -14,30 +14,41 @@ + + 2.0.4 + + - 1.0.75 + 1.0.83 - 1.0.75 + 1.0.83 - 1.0.75 + 1.0.83 - 0.8.46 + 0.9.4 - 0.8.46 + 0.9.4 + + + + + - 0.5.112 + 0.6.6 - 0.5.112 + 0.6.6 + + 2.3.0 @@ -45,6 +56,7 @@ 2.3.0 + diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj index f3b649fb5..fb252169a 100644 --- a/src/Greenshot.Core/Greenshot.Core.csproj +++ b/src/Greenshot.Core/Greenshot.Core.csproj @@ -11,9 +11,14 @@ + + + + - 0.5.112 + 0.6.6 + diff --git a/src/Greenshot.Core/Sources/DwmWindowSource.cs b/src/Greenshot.Core/Sources/DwmWindowSource.cs index 21d5ae708..afd7baf61 100644 --- a/src/Greenshot.Core/Sources/DwmWindowSource.cs +++ b/src/Greenshot.Core/Sources/DwmWindowSource.cs @@ -43,7 +43,7 @@ namespace Greenshot.Core.Sources public DwmWindowSource(ICaptureConfiguration captureConfiguration, Func retrieveWindowFunc = null) { _captureConfiguration = captureConfiguration; - _retrieveWindowFunc = retrieveWindowFunc ?? InteropWindowQuery.GetActiveWindow; + _retrieveWindowFunc = retrieveWindowFunc ?? InteropWindowQuery.GetForegroundWindow; } public ValueTask> Import(CancellationToken cancellationToken = default) diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 9b9dac314..923b38c5c 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -15,8 +15,11 @@ 2.0.4 - 1.0.75 + 1.0.83 + + + 2.3.0 diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 92578eb26..45f2520ed 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -29,41 +29,45 @@ 2.0.4 + + - 1.0.79 + 1.1.3 - 1.0.75 + 1.0.83 - 1.0.75 + 1.0.83 - 1.0.75 + 1.0.83 - 1.0.75 + 1.0.83 - 0.8.46 + 0.9.4 - 0.8.46 + 0.9.4 + - 1.2.1 + 1.3.11 - 1.2.1 + 1.3.11 - 0.5.112 + 0.6.6 - 0.5.112 + 0.6.6 + - 0.5.112 + 0.6.6 1.1.0 @@ -113,6 +117,7 @@ 4.3.0 + diff --git a/src/Greenshot/Helpers/CaptureHelper.cs b/src/Greenshot/Helpers/CaptureHelper.cs index ec9287759..a43cc11b7 100644 --- a/src/Greenshot/Helpers/CaptureHelper.cs +++ b/src/Greenshot/Helpers/CaptureHelper.cs @@ -678,7 +678,7 @@ namespace Greenshot.Helpers } else { - SelectedCaptureWindow = InteropWindowQuery.GetActiveWindow(); + SelectedCaptureWindow = InteropWindowQuery.GetForegroundWindow(); if (SelectedCaptureWindow != null) { if (Log.IsDebugEnabled()) @@ -997,7 +997,7 @@ namespace Greenshot.Helpers private void SetDpi() { // Workaround for proble with DPI retrieval, the FromHwnd activates the window... - var previouslyActiveWindow = InteropWindowQuery.GetActiveWindow(); + var previouslyActiveWindow = InteropWindowQuery.GetForegroundWindow(); // Workaround for changed DPI settings in Windows 7 using (var graphics = Graphics.FromHwnd(MainForm.Instance.Handle)) {