From 1ed3bd64787f10ef74746d35d0fda7331b2e4693 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 24 Feb 2020 23:36:30 +0000 Subject: [PATCH] CtrlLib: win32 dark theme improvements, ide: cosmetics git-svn-id: svn://ultimatepp.org/upp/trunk@14077 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/ChWin32.cpp | 3 +-- uppsrc/ide/ide.lay | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/uppsrc/CtrlLib/ChWin32.cpp b/uppsrc/CtrlLib/ChWin32.cpp index 542b7164c..612547fcb 100644 --- a/uppsrc/CtrlLib/ChWin32.cpp +++ b/uppsrc/CtrlLib/ChWin32.cpp @@ -653,8 +653,7 @@ void ChSysInit() } } - if(Ctrl::IsDarkThemeEnabled() && IsSystemThemeDark() && !IsDark(Color::FromCR(GetSysColor(COLOR_WINDOW)))) - sEmulateDarkTheme = true; + sEmulateDarkTheme = Ctrl::IsDarkThemeEnabled() && IsSystemThemeDark() && !IsDark(Color::FromCR(GetSysColor(COLOR_WINDOW))); CtrlImg::Reset(); CtrlsImg::Reset(); diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay index e43e42944..ba618ef7b 100644 --- a/uppsrc/ide/ide.lay +++ b/uppsrc/ide/ide.lay @@ -239,7 +239,7 @@ END_LAYOUT LAYOUT(BuildMethodsDefaultBuilderSetupLayout, 648, 500) ITEM(Label, dv___0, SetLabel(t_("Compiler name")).LeftPosZ(0, 104).TopPosZ(4, 19)) - ITEM(EditString, compiler, LeftPosZ(132, 516).TopPosZ(4, 19)) + ITEM(EditString, compiler, HSizePosZ(132, 0).TopPosZ(4, 19)) ITEM(Label, dv___2, SetLabel(t_("External debugger")).LeftPosZ(0, 100).TopPosZ(24, 19)) ITEM(EditString, debugger, HSizePosZ(132, 0).TopPosZ(24, 19)) ITEM(Label, dv___4, SetLabel(t_("Common options")).LeftPosZ(0, 112).TopPosZ(44, 19))