ShellExtension: Add 48x48 icons

diff --git a/ShellExtension/Resource.h b/ShellExtension/Resource.h
index b1bef60..287b0c8 100644 (file)
--- a/ShellExtension/Resource.h
+++ b/ShellExtension/Resource.h
@@ -18,12 +18,14 @@
 #define IDB_WINMERGEDIR                 203
 #define IDB_WINMERGE32                  204
 #define IDB_WINMERGEDIR32               205
+#define IDB_WINMERGE48                  206
+#define IDB_WINMERGEDIR48               207
 
 // Next default values for new objects
 //
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        204
+#define _APS_NEXT_RESOURCE_VALUE        208
 #define _APS_NEXT_COMMAND_VALUE         32768
 #define _APS_NEXT_CONTROL_VALUE         201
 #define _APS_NEXT_SYMED_VALUE           111

diff --git a/ShellExtension/ShellExtension.rc b/ShellExtension/ShellExtension.rc
index 44db386..eb5f82d 100644 (file)
--- a/ShellExtension/ShellExtension.rc
+++ b/ShellExtension/ShellExtension.rc
@@ -299,8 +299,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,16,5,8\r
- PRODUCTVERSION 1,16,5,8\r
+ FILEVERSION 1,16,5,9\r
+ PRODUCTVERSION 1,16,5,9\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -317,12 +317,12 @@ BEGIN
         BEGIN\r
             VALUE "CompanyName", "http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge.html"\r
             VALUE "FileDescription", "WinMerge Shell Integration library"\r
-            VALUE "FileVersion", "1.16.5.8"\r
+            VALUE "FileVersion", "1.16.5.9"\r
             VALUE "InternalName", "ShellExtension"\r
             VALUE "LegalCopyright", "Copyright 2003-2016"\r
             VALUE "OriginalFilename", "ShellExtension.DLL"\r
             VALUE "ProductName", "WinMerge Shell Integration library"\r
-            VALUE "ProductVersion", "1.16.5.8"\r
+            VALUE "ProductVersion", "1.16.5.9"\r
         END\r
     END\r
     BLOCK "VarFileInfo"\r
@@ -346,8 +346,10 @@ IDR_WINMERGESHELL       REGISTRY                "WinMergeShell.rgs"
 \r
 IDB_WINMERGE            BITMAP                  "WinMerge.bmp"\r
 IDB_WINMERGE32          BITMAP                  "WinMerge32.bmp"\r
+IDB_WINMERGE48          BITMAP                  "WinMerge48.bmp"\r
 IDB_WINMERGEDIR         BITMAP                  "WinMergeDir.bmp"\r
 IDB_WINMERGEDIR32       BITMAP                  "WinMergeDir32.bmp"\r
+IDB_WINMERGEDIR48       BITMAP                  "WinMergeDir48.bmp"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r

diff --git a/ShellExtension/WinMerge48.bmp b/ShellExtension/WinMerge48.bmp
new file mode 100644 (file)
index 0000000..9188932
Binary files /dev/null and b/ShellExtension/WinMerge48.bmp differ

diff --git a/ShellExtension/WinMergeDir48.bmp b/ShellExtension/WinMergeDir48.bmp
new file mode 100644 (file)
index 0000000..843d7b1
Binary files /dev/null and b/ShellExtension/WinMergeDir48.bmp differ

diff --git a/ShellExtension/WinMergeShell.cpp b/ShellExtension/WinMergeShell.cpp
index 398a5a4..6eee1d0 100644 (file)
--- a/ShellExtension/WinMergeShell.cpp
+++ b/ShellExtension/WinMergeShell.cpp
@@ -191,8 +191,8 @@ CWinMergeShell::CWinMergeShell()
        m_dwMenuState = 0;
        int cx = GetSystemMetrics(SM_CXMENUCHECK);
        int cy = GetSystemMetrics(SM_CYMENUCHECK);
-       int id_fileicon = cx > 16 ? IDB_WINMERGE32 : IDB_WINMERGE;
-       int id_diricon = cx > 16 ? IDB_WINMERGEDIR32 : IDB_WINMERGEDIR;
+       int id_fileicon = cx > 16 ? (cx > 32 ? IDB_WINMERGE48 : IDB_WINMERGE32) : IDB_WINMERGE;
+       int id_diricon = cx > 16 ? (cx > 32 ? IDB_WINMERGEDIR48 : IDB_WINMERGEDIR32) : IDB_WINMERGEDIR;
 
        // compress or stretch icon bitmap according to menu item height
        HBITMAP hMergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(id_fileicon), IMAGE_BITMAP,