windows/QuickLook
1
0
Fork 0
mirror of https://github.com/QL-Win/QuickLook.git synced 2025-09-15 20:52:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix window resize when switching; fix invoke

Browse Source
This commit is contained in:
Paddy Xu
2017-05-24 19:59:49 +03:00
parent 8238da223a
commit 8e02828bec
6 changed files with 63 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
QuickLook/Converters/BooleanToResizeBorderThicknessConverter.cs
View File

@@ -10,7 +10,7 @@ namespace QuickLook.Converters
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value == null)
return Visibility.Visible;
return 0;
var v = (bool) value;

25
QuickLook/Converters/BooleanToResizeModeConverter.cs Normal file
View File

@@ -0,0 +1,25 @@
using System;
using System.Globalization;
using System.Windows;
using System.Windows.Data;
namespace QuickLook.Converters
{
public sealed class BooleanToResizeModeConverter : DependencyObject, IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value == null)
return ResizeMode.CanResize;
var v = (bool) value;
return v ? ResizeMode.CanResize : ResizeMode.NoResize;
}
object IValueConverter.ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

5
QuickLook/MainWindowTransparent.xaml
View File

@@ -17,8 +17,13 @@
ShowActivated="False" ShowInTaskbar="False"
FontFamily="Segoe UI,Microsoft Yahei UI">
<Window.Resources>
<converters:BooleanToResizeModeConverter x:Key="BooleanToResizeModeConverter" />
<converters:BooleanToResizeBorderThicknessConverter x:Key="BooleanToResizeBorderThicknessConverter" />
</Window.Resources>
<Window.ResizeMode>
<Binding Converter="{StaticResource BooleanToResizeModeConverter}" ElementName="mainWindow"
Path="ContextObject.CanResize" />
</Window.ResizeMode>
<WindowChrome.WindowChrome>
<WindowChrome CaptionHeight="{Binding Height, ElementName=titlebar}"
ResizeBorderThickness="{Binding ContextObject.CanResize, Converter={StaticResource BooleanToResizeBorderThicknessConverter}, ElementName=mainWindow}"

64
QuickLook/MainWindowTransparent.xaml.cs
View File

@@ -55,24 +55,6 @@ namespace QuickLook
BeginHide(true);
}
private new void Show()
{
// revert UI changes
ContextObject.IsBusy = true;
var newHeight = ContextObject.PreferredSize.Height + titlebar.Height + windowBorder.BorderThickness.Top +
windowBorder.BorderThickness.Bottom;
var newWidth = ContextObject.PreferredSize.Width + windowBorder.BorderThickness.Left +
windowBorder.BorderThickness.Right;
ResizeAndCenter(new Size(newWidth, newHeight));
base.Show();
//if (!ContextObject.CanFocus)
// WindowHelper.SetNoactivate(new WindowInteropHelper(this));
}
private void ResizeAndCenter(Size size)
{
if (!IsLoaded)
@@ -103,21 +85,6 @@ namespace QuickLook
ContextObject.ViewerPlugin?.Cleanup();
}
private new void Hide()
{
UnloadPlugin();
ContextObject.Reset();
GC.Collect();
// revert UI changes
ContextObject.IsBusy = true;
base.Hide();
//Left -= 10000;
//Dispatcher.Delay(100, _ => base.Hide());
}
internal void BeginShow(IViewer matchedPlugin, string path)
{
ContextObject.CurrentContentContainer = container;
@@ -129,8 +96,20 @@ namespace QuickLook
SetOpenWithButtonAndPath(path);
// revert UI changes
ContextObject.IsBusy = true;
var newHeight = ContextObject.PreferredSize.Height + titlebar.Height + windowBorder.BorderThickness.Top +
windowBorder.BorderThickness.Bottom;
var newWidth = ContextObject.PreferredSize.Width + windowBorder.BorderThickness.Left +
windowBorder.BorderThickness.Right;
ResizeAndCenter(new Size(newWidth, newHeight));
Show();
//WindowHelper.SetActivate(new WindowInteropHelper(this), ContextObject.CanFocus);
// load plugin, do not block UI
Exception thrown = null;
Dispatcher.BeginInvoke(new Action(() =>
@@ -159,9 +138,9 @@ namespace QuickLook
buttonOpenWith.Content = isExe == true ? $"Run {appFriendlyName}" : $"Open with {appFriendlyName}";
}
internal bool BeginHide(bool quit = false)
internal bool BeginHide(bool quitIfViewer = false, bool disposePluginOnly = false)
{
if (quit && App.RunningAsViewer)
if (quitIfViewer && App.RunningAsViewer)
{
Application.Current.Shutdown();
return true;
@@ -170,9 +149,20 @@ namespace QuickLook
if (Visibility != Visibility.Visible)
return false;
Hide();
UnloadPlugin();
ContextObject.Reset();
GC.Collect();
return true;
// revert UI changes
ContextObject.IsBusy = true;
if (!disposePluginOnly)
{
Hide();
return true;
}
return false;
}
}
}

1
QuickLook/QuickLook.csproj
View File

@@ -80,6 +80,7 @@
<Compile Include="..\GitVersion.cs">
<Link>Properties\GitVersion.cs</Link>
</Compile>
<Compile Include="Converters\BooleanToResizeModeConverter.cs" />
<Compile Include="Converters\BooleanToVisibilityCollapsedConverter.cs" />
<Compile Include="Converters\BooleanToResizeBorderThicknessConverter.cs" />
<Compile Include="Helpers\AutoStartupHelper.cs" />

7
QuickLook/ViewWindowManager.cs
View File

@@ -32,14 +32,15 @@ namespace QuickLook
// do we need switch to another file?
var replaceView = key == Keys.Up || key == Keys.Down || key == Keys.Left || key == Keys.Right;
if (replaceView && _currentMainWindow.IsLoaded && _currentMainWindow.Visibility != Visibility.Visible)
if (replaceView && _currentMainWindow.Visibility != Visibility.Visible)
return;
if (!WindowHelper.IsFocusedControlExplorerItem())
if (!WindowHelper.IsFocusedWindowSelf())
if (replaceView || !WindowHelper.IsFocusedWindowSelf())
return;
if (!replaceView && _currentMainWindow.BeginHide())
// should the window be closed (replaceView == false), return without showing new one
if (_currentMainWindow.BeginHide(disposePluginOnly: replaceView))
return;
var path = GetCurrentSelection();