show image size at window titlebar

shibayan · Nov 9, 2015 · 4242c66 · 4242c66
1 parent d6ae284
commit 4242c66
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 21 deletions.
diff --git a/src/WinQuickLook/Converters/FileInfoToFileSizeConverter.cs b/src/WinQuickLook/Converters/FileInfoToFileSizeConverter.cs
@@ -22,7 +22,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             {
                 var length = fileInfo.Length;
 
-                return GetSizeFormat(length);
+                return WinExplorerHelper.GetSizeFormat(length);
             }
 
             var directoryInfo = value as DirectoryInfo;
@@ -41,23 +41,5 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         {
             return DependencyProperty.UnsetValue;
         }
-
-        private static object GetSizeFormat(long length)
-        {
-            if (length >= 1024 * 1024 * 1024)
-            {
-                return $"{length / (double)(1024 * 1024 * 1024):0.##} GB";
-            }
-            if (length >= 1024 * 1024)
-            {
-                return $"{length / (double)(1024 * 1024):0.##} MB";
-            }
-            if (length >= 1024)
-            {
-                return $"{length / (double)1024:0.##} KB";
-            }
-
-            return $"{length} B";
-        }
     }
 }
diff --git a/src/WinQuickLook/Handlers/TextPreviewHandler.cs b/src/WinQuickLook/Handlers/TextPreviewHandler.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 
 using WinQuickLook.Interop;
 
@@ -35,6 +36,8 @@ public override FrameworkElement GetElement(string fileName)
             textBox.Text = encoding.GetString(contents);
             textBox.IsReadOnly = true;
             textBox.IsReadOnlyCaretVisible = false;
+            textBox.FontFamily = new FontFamily("Consolas");
+            textBox.FontSize = 13;
             textBox.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
             textBox.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
             textBox.EndInit();

diff --git a/src/WinQuickLook/Properties/AssemblyInfo.cs b/src/WinQuickLook/Properties/AssemblyInfo.cs
@@ -49,4 +49,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
diff --git a/src/WinQuickLook/QuickLookWindow.xaml.cs b/src/WinQuickLook/QuickLookWindow.xaml.cs
@@ -8,6 +8,7 @@
 using System.Windows.Forms.Integration;
 using System.Windows.Interop;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 using WinQuickLook.Handlers;
 using WinQuickLook.Interop;
@@ -96,7 +97,16 @@ public void Open(string fileName)
 
         public new void Show()
         {
-            Title = _fileInfo.Name;
+            if (PreviewHost is Image)
+            {
+                var bitmap = (BitmapSource)((Image)PreviewHost).Source;
+
+                Title = $"{_fileInfo.Name} ({bitmap.PixelWidth}x{bitmap.PixelHeight} - {WinExplorerHelper.GetSizeFormat(_fileInfo.Length)})";
+            }
+            else
+            {
+                Title = _fileInfo.Name;
+            }
 
             base.Show();
 

diff --git a/src/WinQuickLook/WinExplorerHelper.cs b/src/WinQuickLook/WinExplorerHelper.cs
@@ -21,6 +21,24 @@ public static void CreateLink(string linkPath)
             Marshal.FinalReleaseComObject(shellLink);
         }
 
+        public static object GetSizeFormat(long length)
+        {
+            if (length >= 1024 * 1024 * 1024)
+            {
+                return $"{length / (double)(1024 * 1024 * 1024):0.##} GB";
+            }
+            if (length >= 1024 * 1024)
+            {
+                return $"{length / (double)(1024 * 1024):0.##} MB";
+            }
+            if (length >= 1024)
+            {
+                return $"{length / (double)1024:0.##} KB";
+            }
+
+            return $"{length} B";
+        }
+
         public static string GetSelectedItem()
         {
             var foregroundHwnd = NativeMethods.GetForegroundWindow();