• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28306 (tree)
Time2018-07-21 16:45:22
Authorstefankueng

Log Message

Load the icons for the toolbar in the required size, not the default size.

Change Summary

Incremental Difference

--- trunk/src/TortoiseIDiff/MainWindow.cpp (revision 28305)
+++ trunk/src/TortoiseIDiff/MainWindow.cpp (revision 28306)
@@ -1167,7 +1167,7 @@
11671167 HICON hIcon = nullptr;
11681168 if (selectionPaths.empty())
11691169 {
1170- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_OVERLAP));
1170+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_OVERLAP), imgSize, imgSize);
11711171 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
11721172 tbb[index].idCommand = ID_VIEW_OVERLAPIMAGES;
11731173 tbb[index].fsState = TBSTATE_ENABLED;
@@ -1175,7 +1175,7 @@
11751175 tbb[index].dwData = 0;
11761176 tbb[index++].iString = 0;
11771177
1178- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_BLEND));
1178+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_BLEND), imgSize, imgSize);
11791179 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
11801180 tbb[index].idCommand = ID_VIEW_BLENDALPHA;
11811181 tbb[index].fsState = 0;
@@ -1183,7 +1183,7 @@
11831183 tbb[index].dwData = 0;
11841184 tbb[index++].iString = 0;
11851185
1186- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_LINK));
1186+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_LINK), imgSize, imgSize);
11871187 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
11881188 tbb[index].idCommand = ID_VIEW_LINKIMAGESTOGETHER;
11891189 tbb[index].fsState = TBSTATE_ENABLED | TBSTATE_CHECKED;
@@ -1191,7 +1191,7 @@
11911191 tbb[index].dwData = 0;
11921192 tbb[index++].iString = 0;
11931193
1194- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_FITWIDTHS));
1194+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_FITWIDTHS), imgSize, imgSize);
11951195 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
11961196 tbb[index].idCommand = ID_VIEW_FITIMAGEWIDTHS;
11971197 tbb[index].fsState = TBSTATE_ENABLED;
@@ -1199,7 +1199,7 @@
11991199 tbb[index].dwData = 0;
12001200 tbb[index++].iString = 0;
12011201
1202- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_FITHEIGHTS));
1202+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_FITHEIGHTS), imgSize, imgSize);
12031203 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
12041204 tbb[index].idCommand = ID_VIEW_FITIMAGEHEIGHTS;
12051205 tbb[index].fsState = TBSTATE_ENABLED;
@@ -1214,7 +1214,7 @@
12141214 tbb[index].dwData = 0;
12151215 tbb[index++].iString = 0;
12161216 }
1217- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_VERTICAL));
1217+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_VERTICAL), imgSize, imgSize);
12181218 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
12191219 tbb[index].idCommand = ID_VIEW_ARRANGEVERTICAL;
12201220 tbb[index].fsState = TBSTATE_ENABLED;
@@ -1222,7 +1222,7 @@
12221222 tbb[index].dwData = 0;
12231223 tbb[index++].iString = 0;
12241224
1225- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_FITINWINDOW));
1225+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_FITINWINDOW), imgSize, imgSize);
12261226 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
12271227 tbb[index].idCommand = ID_VIEW_FITIMAGESINWINDOW;
12281228 tbb[index].fsState = TBSTATE_ENABLED;
@@ -1230,7 +1230,7 @@
12301230 tbb[index].dwData = 0;
12311231 tbb[index++].iString = 0;
12321232
1233- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_ORIGSIZE));
1233+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_ORIGSIZE), imgSize, imgSize);
12341234 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
12351235 tbb[index].idCommand = ID_VIEW_ORININALSIZE;
12361236 tbb[index].fsState = TBSTATE_ENABLED;
@@ -1238,7 +1238,7 @@
12381238 tbb[index].dwData = 0;
12391239 tbb[index++].iString = 0;
12401240
1241- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_ZOOMIN));
1241+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_ZOOMIN), imgSize, imgSize);
12421242 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
12431243 tbb[index].idCommand = ID_VIEW_ZOOMIN;
12441244 tbb[index].fsState = TBSTATE_ENABLED;
@@ -1246,7 +1246,7 @@
12461246 tbb[index].dwData = 0;
12471247 tbb[index++].iString = 0;
12481248
1249- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_ZOOMOUT));
1249+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_ZOOMOUT), imgSize, imgSize);
12501250 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
12511251 tbb[index].idCommand = ID_VIEW_ZOOMOUT;
12521252 tbb[index].fsState = TBSTATE_ENABLED;
@@ -1261,7 +1261,7 @@
12611261 tbb[index].dwData = 0;
12621262 tbb[index++].iString = 0;
12631263
1264- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_IMGINFO));
1264+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_IMGINFO), imgSize, imgSize);
12651265 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
12661266 tbb[index].idCommand = ID_VIEW_IMAGEINFO;
12671267 tbb[index].fsState = TBSTATE_ENABLED;
Show on old repository browser