ShellExtension: Add 32x32 bitmaps

diff --git a/ShellExtension/Resource.h b/ShellExtension/Resource.h
index 2e24e0d..b1bef60 100644 (file)
--- a/ShellExtension/Resource.h
+++ b/ShellExtension/Resource.h
@@ -16,6 +16,8 @@
 #define IDS_RESELECT_FIRST              110
 #define IDB_WINMERGE                    202
 #define IDB_WINMERGEDIR                 203
+#define IDB_WINMERGE32                  204
+#define IDB_WINMERGEDIR32               205
 
 // Next default values for new objects
 //

diff --git a/ShellExtension/ShellExtension.rc b/ShellExtension/ShellExtension.rc
index e09afe2..2cec5e2 100644 (file)
--- a/ShellExtension/ShellExtension.rc
+++ b/ShellExtension/ShellExtension.rc
@@ -357,7 +357,9 @@ IDR_WINMERGESHELL       REGISTRY                "WinMergeShell.rgs"
 //\r
 \r
 IDB_WINMERGE            BITMAP                  "WinMerge.bmp"\r
+IDB_WINMERGE32          BITMAP                  "WinMerge32.bmp"\r
 IDB_WINMERGEDIR         BITMAP                  "WinMergeDir.bmp"\r
+IDB_WINMERGEDIR32       BITMAP                  "WinMergeDir32.bmp"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r

diff --git a/ShellExtension/ShellExtension.vcxproj b/ShellExtension/ShellExtension.vcxproj
index 5d1a584..1d6e44e 100644 (file)
--- a/ShellExtension/ShellExtension.vcxproj
+++ b/ShellExtension/ShellExtension.vcxproj
@@ -284,7 +284,6 @@ echo Warning : Cannot register Unicode DLL on Windows 95
     <CustomBuildStep Include="ShellExtensionU.def" />\r
     <None Include="WinMerge.bmp" />\r
     <None Include="WinMergeDir.bmp" />\r
-    <None Include="WinMergeParent.bmp" />\r
     <None Include="WinMergeShell.rgs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -507,6 +506,10 @@ echo Warning : Cannot register Unicode DLL on Windows 95
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|x64'">true</ExcludedFromBuild>\r
     </ResourceCompile>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Image Include="WinMerge32.bmp" />\r
+    <Image Include="WinMergeDir32.bmp" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/ShellExtension/ShellExtension.vcxproj.filters b/ShellExtension/ShellExtension.vcxproj.filters
index 6b13a27..71d38ec 100644 (file)
--- a/ShellExtension/ShellExtension.vcxproj.filters
+++ b/ShellExtension/ShellExtension.vcxproj.filters
@@ -41,9 +41,6 @@
     <None Include="WinMergeDir.bmp">\r
       <Filter>Resource Files</Filter>\r
     </None>\r
-    <None Include="WinMergeParent.bmp">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Midl Include="ShellExtension.idl">\r
@@ -173,4 +170,12 @@
       <Filter>Source Files</Filter>\r
     </CustomBuildStep>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Image Include="WinMerge32.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </Image>\r
+    <Image Include="WinMergeDir32.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </Image>\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file

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

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

diff --git a/ShellExtension/WinMergeShell.cpp b/ShellExtension/WinMergeShell.cpp
index d3203d5..7648b98 100644 (file)
--- a/ShellExtension/WinMergeShell.cpp
+++ b/ShellExtension/WinMergeShell.cpp
@@ -189,12 +189,16 @@ static HBITMAP MakeBitmapBackColorTransparent(HBITMAP hbmSrc)
 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;
 
        // compress or stretch icon bitmap according to menu item height
-       HBITMAP hMergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(IDB_WINMERGE), IMAGE_BITMAP,
-                       GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK), LR_DEFAULTCOLOR);
-       HBITMAP hMergeDirBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(IDB_WINMERGEDIR), IMAGE_BITMAP,
-                       GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK), LR_DEFAULTCOLOR);
+       HBITMAP hMergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(id_fileicon), IMAGE_BITMAP,
+                       cx, cy, LR_DEFAULTCOLOR);
+       HBITMAP hMergeDirBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(id_diricon), IMAGE_BITMAP,
+                       cx, cy, LR_DEFAULTCOLOR);
 
        OSVERSIONINFO osvi;
        osvi.dwOSVersionInfoSize = sizeof OSVERSIONINFO;