no need revemoving thr run button when pinned

This commit is contained in:
Paddy Xu
2017-07-15 11:20:35 +03:00
parent 147065e023
commit 88f892bd05
2 changed files with 18 additions and 5 deletions

View File

@@ -18,7 +18,6 @@
<Window.Resources>
<converters:BooleanToResizeModeConverter x:Key="BooleanToResizeModeConverter" />
<converters:BooleanToResizeBorderThicknessConverter x:Key="BooleanToResizeBorderThicknessConverter" />
<converters:BooleanTrueToVisibilityCollapsedConverter x:Key="BooleanTrueToVisibilityCollapsedConverter" />
</Window.Resources>
<Window.ResizeMode>
<Binding Converter="{StaticResource BooleanToResizeModeConverter}" ElementName="mainWindow"
@@ -66,7 +65,6 @@
Margin="10,0,0,0" Padding="5,0"
Focusable="False" Cursor="Hand"
Background="#E5EEEEEE" BorderBrush="#E59A9A9A"
Visibility="{Binding Pinned,ElementName=mainWindow,Converter={StaticResource BooleanTrueToVisibilityCollapsedConverter}}"
WindowChrome.IsHitTestVisibleInChrome="True" Foreground="#FF404040">
<Button.ContentTemplate>
<DataTemplate>

View File

@@ -58,7 +58,6 @@ namespace QuickLook
{
if (Pinned) return;
Pinned = true;
buttonOpenWith.Visibility = Visibility.Collapsed;
ViewWindowManager.GetInstance().ForgetCurrentWindow();
};
@@ -71,7 +70,12 @@ namespace QuickLook
};
buttonOpenWith.Click += (sender, e) =>
ViewWindowManager.GetInstance().RunAndClosePreview();
{
if (Pinned)
RunAndClose();
else
ViewWindowManager.GetInstance().RunAndClosePreview();
};
}
public bool Pinned
@@ -91,7 +95,7 @@ namespace QuickLook
public event PropertyChangedEventHandler PropertyChanged;
internal void RunAndHide()
internal void Run()
{
if (string.IsNullOrEmpty(PreviewPath))
return;
@@ -107,9 +111,20 @@ namespace QuickLook
{
Debug.WriteLine(e.Message);
}
}
internal void RunAndHide()
{
Run();
BeginHide();
}
internal void RunAndClose()
{
Run();
BeginClose();
}
private void ResizeAndCenter(Size size)
{
if (!IsLoaded)