- 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

diff --git a/reactos/dll/cpl/desk/advappdlg.c b/reactos/dll/cpl/desk/advappdlg.c
index 713cad2..c49c4e7 100644 (file)
--- a/reactos/dll/cpl/desk/advappdlg.c
+++ b/reactos/dll/cpl/desk/advappdlg.c
@@ -309,6 +309,7 @@ UpdateControls(HWND hwndDlg, int iElement)
 \r
        /* First enable / disable the controls */\r
        EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E), (g_Assignment[iElement].Size != -1));\r
+       EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD), (g_Assignment[iElement].Size != -1));\r
        EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_T), (g_Assignment[iElement].Size != -1));\r
        EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_T), (g_Assignment[iElement].Color1 != -1));\r
        EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_T), (g_Assignment[iElement].Color2 != -1));\r
@@ -325,7 +326,10 @@ UpdateControls(HWND hwndDlg, int iElement)
        UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_B, 1, g_Assignment[iElement].Color2);\r
        UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_FONTCOLOR_B, 2, g_Assignment[iElement].FontColor);\r
 \r
-       SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, g_Assignment[iElement].Size == -1 ? 0 : g->ThemeAdv.Size[g_Assignment[iElement].Size], FALSE);\r
+       if (g_Assignment[iElement].Size != -1)\r
+               SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, g->ThemeAdv.Size[g_Assignment[iElement].Size], FALSE);\r
+       else\r
+               SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, TEXT(""));\r
 \r
        HDC hdcDlg = GetDC(hwndDlg);    \r
        if (g_Assignment[iElement].Font != -1)\r

diff --git a/reactos/dll/cpl/desk/appearance.c b/reactos/dll/cpl/desk/appearance.c
index 7308566..9c870f1 100644 (file)
--- 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 */