From edc073a0ea7611a0b9be0abd1945b5294bea018d Mon Sep 17 00:00:00 2001
From: Paddy Xu <xupaddy@gmail.com>
Date: Sat, 4 Nov 2017 16:30:56 +0200
Subject: [PATCH] dark theme for ImageViewer

---
 .../ImagePanel.xaml                             |   4 ++--
 .../QuickLook.Plugin.ImageViewer/Plugin.cs      |  11 +++++++----
 .../QuickLook.Plugin.ImageViewer.csproj         |   1 +
 .../Resources/background-b.png                  | Bin 0 -> 15002 bytes
 .../PdfViewerControl.xaml                       |   1 +
 .../QuickLook.Plugin.PDFViewer/Plugin.cs        |   8 +++++++-
 QuickLook/ViewerWindow.xaml.cs                  |   2 +-
 7 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Resources/background-b.png

diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml
index 18d272c..0b968f9 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml
+++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml
@@ -11,14 +11,14 @@
     <Grid>
         <Rectangle Visibility="{Binding BackgroundVisibility, ElementName=imagePanel}">
             <Rectangle.Fill>
-                <ImageBrush x:Name="backgroundBrush" ImageSource="Resources/background.png" AlignmentY="Top"
+                <ImageBrush x:Name="backgroundBrush" ImageSource="Resources/background-b.png" AlignmentY="Top"
                             Viewport="0,0,32,32"
                             ViewportUnits="Absolute" Stretch="UniformToFill" TileMode="Tile" />
             </Rectangle.Fill>
         </Rectangle>
         <ScrollViewer x:Name="viewPanel" BorderThickness="0" HorizontalScrollBarVisibility="Auto"
                       VerticalScrollBarVisibility="Auto" Focusable="False" IsManipulationEnabled="True">
-            <animatedImage:AnimatedImage x:Name="viewPanelImage" Stretch="None"
+            <animatedImage:AnimatedImage x:Name="viewPanelImage" Stretch="None" Margin="0,32,0,0"
                                          RenderOptions.BitmapScalingMode="{Binding RenderMode, ElementName=imagePanel}"
                                          AnimationUri="{Binding ImageUriSource, ElementName=imagePanel}" />
         </ScrollViewer>
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs
index f33d99c..93ed08b 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs
@@ -58,15 +58,18 @@ namespace QuickLook.Plugin.ImageViewer
             _imageSize = ImageFileHelper.GetImageSize(path) ?? Size.Empty;
 
             if (!_imageSize.IsEmpty)
-                context.SetPreferredSizeFit(_imageSize, 0.8);
+                context.SetPreferredSizeFit(_imageSize, 0.6);
             else
-                context.PreferredSize = new Size(1024, 768);
+                context.PreferredSize = new Size(800, 600);
+
+            context.PreferredSize = new Size(context.PreferredSize.Width, context.PreferredSize.Height + 32);
 
             Directory.SetCurrentDirectory(App.AppPath);
 
-            context.TitlebarBlurVisibility = false;
-            context.TitlebarOverlap = false;
+            context.TitlebarBlurVisibility = true;
+            context.TitlebarOverlap = true;
             context.TitlebarAutoHide = false;
+            context.UseDarkTheme = true;
         }
 
         public void View(string path, ContextObject context)
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj
index a7650a5..33fa89f 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj
@@ -112,6 +112,7 @@
     <Content Include="dcraw.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Resource Include="Resources\background-b.png" />
     <Resource Include="Resources\background.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Resources/background-b.png b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Resources/background-b.png
new file mode 100644
index 0000000000000000000000000000000000000000..efbd911f6bcd507ad117a5e99a4e3dac76aa969a
GIT binary patch
literal 15002
zcmeI3&u`;I6vt=zAwk8iv=R~$T&%2CDk_dWj-Aw2lHJm@w9=+jZD8BOik;Y##%f|4
z+iB9CR?CSi5)wxa95^5jTtR{Z`~h6K!3~7O6;8|8&JXt`8C9@|%S6hLH*dc0jXyK*
z#TS3LzxUSll~-2~Lf3b98VBrKO5QK95A^QM+pFyB#bD<+Lg>c#$@|*JYd2m)$o$=H
z9mPk@dzS6@i^TEUv^eSqi3(Nki~?ex(pYNK6W6O1{`mUag5)~2!hNHuHiJ#tb$2d8
zdU&zdvM)|;(<$7kuT)1C3(%)Akw*QV7g?iPA&qOX-^s92kkTpfX|1r4B$SSt`_iT#
zQpqTmWgC~)rHWa^hPkfkZ%CSo%Zh3$SeI37sivi3Y5XeGSJ<y==ya@u#`ZWJvucHI
z90!)742Q$wuvGNJ69t>5si>NwX)>E3N9SHlMzR;(%7RSdG-zapZV<b^Cna%7+aJWW
zLLo^seT}cHA50T@(U={hsEkOU;G(K55;^u%6AZ#$x-`dDXpi=(7e`Eo7wUqpANx_)
zUy^d_UYeNgNwYc4y>Pw#{=(EzymiJ9jFB!>My>OJDhD+32cb>3&e)~gT6FcX+nH_7
zrAUcq>DuYYT_Q_7nJhgD*$!3NwOX4YC9xm2e7{%EPTBqhp|rV~oT`endf)XNe;B=9
zRiI?H-?M16L1J1@lrmOjY_>GbDpf4Kw5FCURm}y-W`Y<^-*G$Vxfobh^%gE$*su(J
zP1U9`ax-BJRzD7j$(5qy=jP%#w$<^&K8fpYpPW!7@J_1AY%n)-daA5VzvqW+S+tI;
z%A(<%Dm`h|t{26`v*~W5&IXFE>sa=>X|#z}k~M?sveVWbnY4)`8+r-Tc7=30)J`Eb
zn|b+M=!S0(l4@b0v&Q21HVZ#n7QyXurOfuo#$_U7Oe-=mR86Kf)^J64RDGRH66J!;
zC3-t_S>GeQ+??cE9G0w8woPncL#7?0B$ph$Bb$1=Eo++U7-iMytn1n&#ey(%sdn6m
zo!0Z*DQ0Im?QDni{mY{hN6$?=R6xRrCiPb<ObT$?(xx3N(WG^35j*K^bvr2!>Qt3W
zqqAjAm1CJZznxb@kj2l*m**IEsmCj?EL1vcd63BO#6uF&jT3f4u2T6~)XOp$zN#eu
z1wHpa*ocUn{kv_rT2=kCZCKc${=aRQonpI7yc6owmB|5~3|wvJvi-bVS(9p=uf%Hd
z=VY-eW+#fI)x(<L+}JF0HvcH8#@-;EZ<bZ|QgHG)mge11dd!#R-B3DHzT>%Zo%Nt}
zp<p<tO8!B!_I}82_GrCq7$u{sz+tG^cSp2$)NolJj*@;-VwqA6bSxAeFB9e*V_~*c
zx!ba|2D4Fi)5q>NmFW%VTzO8r*wg$myP~HV6~q!r01&<@aPj#7ufPR>@J)e>&j)w~
zE&zmY3S4|Xz$<V8AbeBc;`0GsfeQfPn*tY~5AX_H00`d{xcGd4SKtCb_@=<c=L5U~
z7XZRH1ui}x;1#$45WXpJ@%aF+zy*NtO@WKg2Y3Z80EBM}Tzo#jD{uiId{f}!^8sFg
z3jpDp0vDeT@CsZ22;UUA_<Vp@-~vGSrohGL1H1wk0Kzu~E<PXN6}SKpzA13=`2erL
z1%U8Pfs4-vcm*y1gl`I5d_KS{Z~-8ElZ$I*_6R5S*mIjh_JHQmFExcd+$q^R2Tg=7
zZX@*Q1BCv1!oGh+XrLnW+e3t`PY`;=|LDCRw%Od(-Nr_1^i%ug&fVwzAOF1f(sSQ^
t{`lw59^HI!ccg#1{nayU4tnzBS@ey2?cfVDVzCg~-P&t>`R2pNe*<PbFhKwS

literal 0
HcmV?d00001

diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/PdfViewerControl.xaml b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/PdfViewerControl.xaml
index 6d6dce9..2b5e8e1 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/PdfViewerControl.xaml
+++ b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/PdfViewerControl.xaml
@@ -27,6 +27,7 @@
                  VirtualizingPanel.IsVirtualizing="True" Width="150"
                  SelectedIndex="0"
                  Focusable="False"
+                 Margin="0,32,0,0"
                  Background="#00FFFFFF"
                  ItemsSource="{Binding PageIds, ElementName=thisPdfViewer}"
                  ScrollViewer.HorizontalScrollBarVisibility="Disabled" BorderThickness="0,0,1,0"
diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/Plugin.cs
index 68638fc..3a0d2ed 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/Plugin.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/Plugin.cs
@@ -19,6 +19,7 @@ using System;
 using System.IO;
 using System.Runtime.ExceptionServices;
 using System.Text;
+using System.Windows;
 using System.Windows.Threading;
 
 namespace QuickLook.Plugin.PDFViewer
@@ -56,7 +57,12 @@ namespace QuickLook.Plugin.PDFViewer
 
             var desiredSize = PdfViewerControl.GetDesiredControlSizeByFirstPage(path);
 
-            context.SetPreferredSizeFit(desiredSize, 0.8);
+            context.SetPreferredSizeFit(desiredSize, 0.6);
+
+            context.PreferredSize = new Size(context.PreferredSize.Width, context.PreferredSize.Height + 32);
+
+            context.TitlebarBlurVisibility = true;
+            context.TitlebarOverlap = true;
         }
 
         public void View(string path, ContextObject context)
diff --git a/QuickLook/ViewerWindow.xaml.cs b/QuickLook/ViewerWindow.xaml.cs
index c6b21b2..a33f9d8 100644
--- a/QuickLook/ViewerWindow.xaml.cs
+++ b/QuickLook/ViewerWindow.xaml.cs
@@ -273,7 +273,7 @@ namespace QuickLook
 
             // otherwise, resize it and place it to the old window center.
             var oldCenterX = Left + Width / 2;
-            var oldCenterY = Visibility == Visibility.Visible ? Top + Height / 2 : screen.Top + screen.Height / 2;
+            var oldCenterY = Top + Height / 2;
 
             var newLeft = oldCenterX - size.Width / 2;
             var newTop = oldCenterY - size.Height / 2;