Fix GitHub issue #182: WinMerge toolbar appears too small on UHD and should default...

diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp
index b238815..7dd21d8 100644 (file)
--- a/Src/OptionsInit.cpp
+++ b/Src/OptionsInit.cpp
@@ -63,7 +63,8 @@ void Init(COptionsMgr *pOptions)
        pOptions->InitOption(OPT_SHOW_TOOLBAR, true);
        pOptions->InitOption(OPT_SHOW_STATUSBAR, true);
        pOptions->InitOption(OPT_SHOW_TABBAR, true);
-       pOptions->InitOption(OPT_TOOLBAR_SIZE, GetSystemMetrics(SM_CXSMICON) < 24 ? 0 : 1);
+       const int cxsmicon = GetSystemMetrics(SM_CXSMICON);
+       pOptions->InitOption(OPT_TOOLBAR_SIZE, (cxsmicon < 28) ? 0 : (cxsmicon < 40 ? 1 : 2));
        pOptions->InitOption(OPT_RESIZE_PANES, false);
 
        pOptions->InitOption(OPT_SYNTAX_HIGHLIGHT, true);