• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28276 (tree)
Time2018-07-08 22:51:37
Authorstefankueng

Log Message

Merged revision(s) r28275 from trunk:
* Adjust the toolbar size for high-dpi monitors.

Change Summary

Incremental Difference

--- branches/1.10.x/src/Changelog.txt (revision 28275)
+++ branches/1.10.x/src/Changelog.txt (revision 28276)
@@ -7,6 +7,8 @@
77 an outdated or corrupted working copy. (Stefan)
88 - CHG: Improved project monitor toolbar for
99 high dpi monitors. (Stefan)
10+- CHG: Various improvements for
11+ high-dpi monitors. (Stefan)
1012 - BUG: Wrong titles when editing a conflict. (Stefan)
1113 - BUG: Unshelving failed when the shelve name
1214 contained non-ASCII chars. (Stefan)
--- branches/1.10.x/src/TortoiseIDiff/MainWindow.cpp (revision 28275)
+++ branches/1.10.x/src/TortoiseIDiff/MainWindow.cpp (revision 28276)
@@ -1,6 +1,6 @@
1-// TortoiseIDiff - an image diff viewer in TortoiseSVN
1+// TortoiseIDiff - an image diff viewer in TortoiseSVN
22
3-// Copyright (C) 2006-2015 - TortoiseSVN
3+// Copyright (C) 2006-2015, 2018 - TortoiseSVN
44 // Copyright (C) 2015-2016 - TortoiseGit
55
66 // This program is free software; you can redistribute it and/or
@@ -24,6 +24,7 @@
2424 #include "MainWindow.h"
2525 #include "AboutDlg.h"
2626 #include "TaskbarUUID.h"
27+#include "DPIAware.h"
2728
2829 #pragma comment(lib, "comctl32.lib")
2930
@@ -1136,7 +1137,8 @@
11361137
11371138 TBBUTTON tbb[13];
11381139 // create an imagelist containing the icons for the toolbar
1139- hToolbarImgList = ImageList_Create(24, 24, ILC_COLOR32 | ILC_MASK, 12, 4);
1140+ auto imgSize = CDPIAware::Instance().Scale(24);
1141+ hToolbarImgList = ImageList_Create(imgSize, imgSize, ILC_COLOR32 | ILC_MASK, 12, 4);
11401142 if (!hToolbarImgList)
11411143 return false;
11421144 int index = 0;
Show on old repository browser