From 9d58eb743ef179410ec7697e8b3b97d5081dc975 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Thu, 15 Feb 2007 14:12:36 +0000 Subject: [PATCH] - Enable/disable the size updown control when another window item is selected. - Remove the text when the size edit control gets disabled. - Disable the secondary color for the window item. svn path=/trunk/; revision=25804 --- reactos/dll/cpl/desk/advappdlg.c | 6 +++++- reactos/dll/cpl/desk/appearance.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/reactos/dll/cpl/desk/advappdlg.c b/reactos/dll/cpl/desk/advappdlg.c index 713cad241d7..c49c4e77cae 100644 --- a/reactos/dll/cpl/desk/advappdlg.c +++ b/reactos/dll/cpl/desk/advappdlg.c @@ -309,6 +309,7 @@ UpdateControls(HWND hwndDlg, int iElement) /* First enable / disable the controls */ EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E), (g_Assignment[iElement].Size != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD), (g_Assignment[iElement].Size != -1)); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_T), (g_Assignment[iElement].Size != -1)); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_T), (g_Assignment[iElement].Color1 != -1)); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_T), (g_Assignment[iElement].Color2 != -1)); @@ -325,7 +326,10 @@ UpdateControls(HWND hwndDlg, int iElement) UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_B, 1, g_Assignment[iElement].Color2); UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_FONTCOLOR_B, 2, g_Assignment[iElement].FontColor); - SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, g_Assignment[iElement].Size == -1 ? 0 : g->ThemeAdv.Size[g_Assignment[iElement].Size], FALSE); + if (g_Assignment[iElement].Size != -1) + SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, g->ThemeAdv.Size[g_Assignment[iElement].Size], FALSE); + else + SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, TEXT("")); HDC hdcDlg = GetDC(hwndDlg); if (g_Assignment[iElement].Font != -1) diff --git a/reactos/dll/cpl/desk/appearance.c b/reactos/dll/cpl/desk/appearance.c index 730856661aa..9c870f18ab8 100644 --- a/reactos/dll/cpl/desk/appearance.c +++ b/reactos/dll/cpl/desk/appearance.c @@ -25,7 +25,7 @@ const ASSIGNMENT g_Assignment[NUM_ELEMENTS] = {SIZE_BORDER_X, SIZE_BORDER_Y, COLOR_ACTIVEBORDER, -1, -1, -1}, /* active window border */ {SIZE_MENU_X, SIZE_MENU_Y, COLOR_MENU, -1, FONT_MENU, COLOR_MENUTEXT}, /* menu */ {SIZE_MENU_X, SIZE_MENU_Y, COLOR_HIGHLIGHT, -1, FONT_HILIGHT, COLOR_HIGHLIGHTTEXT},/* marked element */ - {-1, -1, COLOR_WINDOW, COLOR_WINDOWFRAME, -1, COLOR_WINDOWTEXT}, /* window */ + {-1, -1, COLOR_WINDOW, -1 /*COLOR_WINDOWFRAME*/, -1, COLOR_WINDOWTEXT}, /* window */ {SIZE_SCROLL_X, SIZE_SCROLL_Y, COLOR_SCROLLBAR, -1, -1, -1}, /* scroll bar */ {-1, -1, COLOR_3DFACE, -1, -1, COLOR_BTNTEXT}, /* 3d objects */ {SIZE_SMCAPTION_Y,-1, -1, -1, FONT_SMCAPTION, -1}, /* palette window caption */