浏览代码

Bug 2198: Thanks and transitioning help toolbar message in Store installation was not readable in Dark theme

https://winscp.net/tracker/2198
(cherry picked from commit 6fd7c994af337b8837da7ca1acbb6588d90cd8aa)

Source commit: e02620b4c43b8e737d1e4d6d9e7ee7e82908ac82
Martin Prikryl 2 年之前
父节点
当前提交
23980b9f0a
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      source/forms/CustomScpExplorer.cpp

+ 5 - 1
source/forms/CustomScpExplorer.cpp

@@ -1033,6 +1033,9 @@ void TCustomScpExplorerForm::CheckStoreTransition()
 
     TTBXLabelItem * LabelItem;
     LabelItem = new TTBXLabelItem(Toolbar);
+    // Convert to explicit RGB "black" color, to make sure it is contrasting even in Dark theme
+    // (TTBXOfficeXPTheme.GetStandardColor would convert clWindow to "white" in dark theme)
+    LabelItem->FontSettings->Color = static_cast<TColor>(GetSysColor(clWindow));
     LabelItem->Margin = ScaleByTextHeight(MessageDock, 2); // Is this automatically rescaled?
     LabelItem->Caption = LoadStr(STORE_MIGRATION_THANKS);
     Toolbar->Items->Add(LabelItem);
@@ -1045,7 +1048,8 @@ void TCustomScpExplorerForm::CheckStoreTransition()
 
     AddMenuSeparator(Toolbar->Items);
 
-    TTBCustomItem * CloseItem = new TTBXItem(Toolbar);
+    TTBXCustomItem * CloseItem = new TTBXItem(Toolbar);
+    CloseItem->FontSettings->Color = static_cast<TColor>(GetSysColor(clWindow));
     CloseItem->Caption = LoadStr(MESSAGE_DISMISS);
     CloseItem->OnClick = StoreTransitionCloseClick;
     Toolbar->Items->Add(CloseItem);