• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28307 (tree)
Time2018-07-21 16:56:00
Authorstefankueng

Log Message

insert a separator to group "Overlay Images" and "Blend alpha", and move the "Arrange vertical" button to the right.

Change Summary

Incremental Difference

--- trunk/src/TortoiseIDiff/MainWindow.cpp (revision 28306)
+++ trunk/src/TortoiseIDiff/MainWindow.cpp (revision 28307)
@@ -1157,7 +1157,7 @@
11571157
11581158 SendMessage(hwndTB, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
11591159
1160- TBBUTTON tbb[13];
1160+ TBBUTTON tbb[14];
11611161 // create an imagelist containing the icons for the toolbar
11621162 auto imgSize = CDPIAware::Instance().Scale(24);
11631163 hToolbarImgList = ImageList_Create(imgSize, imgSize, ILC_COLOR32 | ILC_MASK, 12, 4);
@@ -1183,6 +1183,13 @@
11831183 tbb[index].dwData = 0;
11841184 tbb[index++].iString = 0;
11851185
1186+ tbb[index].iBitmap = 0;
1187+ tbb[index].idCommand = 0;
1188+ tbb[index].fsState = TBSTATE_ENABLED;
1189+ tbb[index].fsStyle = BTNS_SEP;
1190+ tbb[index].dwData = 0;
1191+ tbb[index++].iString = 0;
1192+
11861193 hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_LINK), imgSize, imgSize);
11871194 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
11881195 tbb[index].idCommand = ID_VIEW_LINKIMAGESTOGETHER;
@@ -1214,13 +1221,6 @@
12141221 tbb[index].dwData = 0;
12151222 tbb[index++].iString = 0;
12161223 }
1217- hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_VERTICAL), imgSize, imgSize);
1218- tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
1219- tbb[index].idCommand = ID_VIEW_ARRANGEVERTICAL;
1220- tbb[index].fsState = TBSTATE_ENABLED;
1221- tbb[index].fsStyle = BTNS_BUTTON;
1222- tbb[index].dwData = 0;
1223- tbb[index++].iString = 0;
12241224
12251225 hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_FITINWINDOW), imgSize, imgSize);
12261226 tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
@@ -1269,6 +1269,14 @@
12691269 tbb[index].dwData = 0;
12701270 tbb[index++].iString = 0;
12711271
1272+ hIcon = LoadIconEx(hResource, MAKEINTRESOURCE(IDI_VERTICAL), imgSize, imgSize);
1273+ tbb[index].iBitmap = ImageList_AddIcon(hToolbarImgList, hIcon);
1274+ tbb[index].idCommand = ID_VIEW_ARRANGEVERTICAL;
1275+ tbb[index].fsState = TBSTATE_ENABLED;
1276+ tbb[index].fsStyle = BTNS_BUTTON;
1277+ tbb[index].dwData = 0;
1278+ tbb[index++].iString = 0;
1279+
12721280 SendMessage(hwndTB, TB_SETIMAGELIST, 0, (LPARAM)hToolbarImgList);
12731281 SendMessage(hwndTB, TB_ADDBUTTONS, (WPARAM)index, (LPARAM) (LPTBBUTTON) &tbb);
12741282 SendMessage(hwndTB, TB_AUTOSIZE, 0, 0);
Show on old repository browser