Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-13 00:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reenable the preview control notification. The user can now select the GUI item clicking it in the preview control.

Browse source 
svn path=/trunk/; revision=25832
This commit is contained in:
Eric Kohl 2007-02-17 21:40:39 +00:00
parent abf9c6e638
commit b6dc9d8a3d
4 changed files with 48 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
reactos/dll/cpl/desk/advappdlg.c
View file

@ -409,6 +409,27 @@ AdvAppearanceDlg_CleanUp(HWND hwndDlg, GLOBALS* g)
} }
static VOID
SelectComboByElement(HWND hwnd, INT id, LPARAM lParam)
{
INT nCount;
INT i;
nCount = SendDlgItemMessage(hwnd, id, CB_GETCOUNT, 0, 0);
if (nCount == CB_ERR)
return;
for (i = 0; i < nCount; i++)
{
if (SendDlgItemMessage(hwnd, id, CB_GETITEMDATA, (WPARAM)i, 0) == lParam)
{
SendDlgItemMessage(hwnd, id, CB_SETCURSEL, (WPARAM)i, 0);
break;
}
}
}
INT_PTR CALLBACK INT_PTR CALLBACK
AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
@ -442,6 +463,13 @@ AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
EndDialog(hwndDlg, 0); EndDialog(hwndDlg, 0);
break; break;
case IDC_APPEARANCE_PREVIEW:
SaveCurrentValues(hwndDlg, g);
SelectComboByElement(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, lParam);
g->CurrentElement = (INT)lParam;
UpdateControls(hwndDlg, g);
break;
case IDC_ADVAPPEARANCE_ELEMENT: case IDC_ADVAPPEARANCE_ELEMENT:
if (HIWORD(wParam) == CBN_SELCHANGE) if (HIWORD(wParam) == CBN_SELCHANGE)
{ {

6
reactos/dll/cpl/desk/appearance.h
View file

@ -67,9 +67,9 @@ typedef struct tagGLOBALS
THEME_PRESET ThemeTemplates[MAX_TEMPLATES]; THEME_PRESET ThemeTemplates[MAX_TEMPLATES];
THEME Theme; THEME Theme;
THEME ThemeAdv; THEME ThemeAdv;
int ColorList[NUM_COLORS]; INT ColorList[NUM_COLORS];
HBITMAP hbmpColor[3]; HBITMAP hbmpColor[3];
int CurrentElement; INT CurrentElement;
COLORREF crCOLOR_BTNFACE; COLORREF crCOLOR_BTNFACE;
COLORREF crCOLOR_BTNSHADOW; COLORREF crCOLOR_BTNSHADOW;
COLORREF crCOLOR_BTNTEXT; COLORREF crCOLOR_BTNTEXT;
@ -81,7 +81,7 @@ typedef struct tagGLOBALS
extern const ASSIGNMENT g_Assignment[NUM_ELEMENTS]; extern const ASSIGNMENT g_Assignment[NUM_ELEMENTS];
extern const TCHAR g_RegColorNames[NUM_COLORS][MAX_COLORNAMELENGTH]; extern const TCHAR g_RegColorNames[NUM_COLORS][MAX_COLORNAMELENGTH];
extern const int g_SizeMetric[NUM_SIZES]; extern const INT g_SizeMetric[NUM_SIZES];
/* prototypes for appearance.c */ /* prototypes for appearance.c */
INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

5
reactos/dll/cpl/desk/preview.c
View file

@ -441,7 +441,10 @@ OnLButtonDown(HWND hwnd, int xPos, int yPos, PPREVIEW_DATA pPreviewData)
if (PtInRect(&pPreviewData->rcDialogButton, pt)) if (PtInRect(&pPreviewData->rcDialogButton, pt))
type = IDX_3D_OBJECTS; type = IDX_3D_OBJECTS;
SendMessage(GetParent(hwnd), WM_USER, 0, type); SendMessage(GetParent(hwnd),
WM_COMMAND,
MAKEWPARAM(GetWindowLongPtrW(hwnd, GWLP_ID), 0),
(LPARAM)type);
} }

27
reactos/dll/cpl/desk/preview.h
View file

@ -6,22 +6,21 @@
* COPYRIGHT: Copyright 2006, 2007 Eric Kohl * COPYRIGHT: Copyright 2006, 2007 Eric Kohl
*/ */
#define IDX_3D_OBJECTS 0 #define IDX_DESKTOP 0
#define IDX_SCROLLBAR 1 #define IDX_INACTIVE_CAPTION 1
#define IDX_DESKTOP 2 #define IDX_INACTIVE_BORDER 2
#define IDX_DIALOG 3 #define IDX_ACTIVE_CAPTION 3
#define IDX_WINDOW 4 #define IDX_ACTIVE_BORDER 4
#define IDX_APPSPACE 5 #define IDX_MENU 5
#define IDX_SELECTION 6 #define IDX_SELECTION 6
#define IDX_MENU 7 #define IDX_WINDOW 7
#define IDX_SCROLLBAR 8
#define IDX_3D_OBJECTS 9
#define IDX_CAPTION_BUTTON 12
#define IDX_DIALOG 14
#define IDX_APPSPACE 16
#define IDX_QUICKINFO 20
#define IDX_QUICKINFO 9
#define IDX_INACTIVE_BORDER 10
#define IDX_ACTIVE_BORDER 11
#define IDX_INACTIVE_CAPTION 15
#define IDX_ACTIVE_CAPTION 16
#define IDX_CAPTION_BUTTON 17
#define PVM_GETCYCAPTION (WM_USER+1) #define PVM_GETCYCAPTION (WM_USER+1)