Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- add some font data to the combo boxes

Browse source 
svn path=/trunk/; revision=24709
This commit is contained in:
Ged Murphy 2006-11-09 20:28:29 +00:00
parent f56d1e28ca
commit f5fe947177
5 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/imagesoft/custcombo.c
View file

@ -1,4 +1,4 @@
#include "precomp.h" #include <precomp.h>
LRESULT WINAPI LRESULT WINAPI

8
reactos/base/applications/imagesoft/floatwindow.c
View file

@ -357,7 +357,7 @@ FloatToolbarWndProc(HWND hwnd,
switch(Message) switch(Message)
{ {
case WM_CREATE: case WM_CREATE:
{
FltInfo = (PFLT_WND)(((LPCREATESTRUCT)lParam)->lpCreateParams); FltInfo = (PFLT_WND)(((LPCREATESTRUCT)lParam)->lpCreateParams);
/*FIXME: read this from registry */ /*FIXME: read this from registry */
@ -375,7 +375,7 @@ FloatToolbarWndProc(HWND hwnd,
0, 0,
(255 * 60) / 100, (255 * 60) / 100,
LWA_ALPHA); LWA_ALPHA);
}
break; break;
case WM_TIMER: case WM_TIMER:
@ -423,6 +423,7 @@ FloatToolbarWndProc(HWND hwnd,
case WM_NCMOUSEMOVE: case WM_NCMOUSEMOVE:
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
{
if (FltInfo->bOpaque == FALSE) if (FltInfo->bOpaque == FALSE)
{ {
SetWindowLong(hwnd, SetWindowLong(hwnd,
@ -442,6 +443,7 @@ FloatToolbarWndProc(HWND hwnd,
200, 200,
NULL); NULL);
} }
}
break; break;
case WM_CLOSE: case WM_CLOSE:
@ -449,6 +451,7 @@ FloatToolbarWndProc(HWND hwnd,
break; break;
case WM_COMMAND: case WM_COMMAND:
{
if (LOWORD(wParam) == IDCANCEL) if (LOWORD(wParam) == IDCANCEL)
ShowHideWindow(FltInfo); ShowHideWindow(FltInfo);
@ -483,6 +486,7 @@ FloatToolbarWndProc(HWND hwnd,
lParam);*/ lParam);*/
break; break;
} }
}
break; break;
case WM_NCACTIVATE: case WM_NCACTIVATE:

1
reactos/base/applications/imagesoft/imagesoft.rbuild
View file

@ -19,6 +19,7 @@
<file>about.c</file> <file>about.c</file>
<file>custcombo.c</file> <file>custcombo.c</file>
<file>floatwindow.c</file> <file>floatwindow.c</file>
<file>font.c</file>
<file>imageprop.c</file> <file>imageprop.c</file>
<file>imagesoft.c</file> <file>imagesoft.c</file>
<file>imgedwnd.c</file> <file>imgedwnd.c</file>

15
reactos/base/applications/imagesoft/mainwnd.c
View file

@ -35,9 +35,9 @@ TBBUTTON StdButtons[] = {
TBBUTTON TextButtons[] = { TBBUTTON TextButtons[] = {
{10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */
{TBICON_BOLD, ID_BOLD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* bold */ {TBICON_BOLD, ID_BOLD, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_CHECK, {0}, 0, 0}, /* bold */
{TBICON_ITALIC, ID_ITALIC, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* italic */ {TBICON_ITALIC, ID_ITALIC, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_CHECK, {0}, 0, 0}, /* italic */
{TBICON_ULINE, ID_ULINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* underline */ {TBICON_ULINE, ID_ULINE, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_CHECK, {0}, 0, 0}, /* underline */
{10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */
@ -221,7 +221,8 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks,
hFontType = CreateWindowEx(0, hFontType = CreateWindowEx(0,
WC_COMBOBOX, WC_COMBOBOX,
NULL, NULL,
WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWN | CBS_SORT | CBS_HASSTRINGS, //| CBS_OWNERDRAWFIXED,
0, 0, 120, 0, 0, 0, 120, 0,
hParent, hParent,
NULL, NULL,
@ -243,6 +244,9 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks,
{ {
DestroyWindow(hFontType); DestroyWindow(hFontType);
} }
/* Create the list of fonts */
FillFontStyleComboList(hFontType);
} }
/* font size combo */ /* font size combo */
@ -270,6 +274,9 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks,
{ {
DestroyWindow(hFontSize); DestroyWindow(hFontSize);
} }
/* Update the font-size-list */
FillFontSizeComboList(hFontSize);
} }
break; break;
} }

5
reactos/base/applications/imagesoft/precomp.h
View file

@ -390,6 +390,11 @@ BOOL InitFloatWndClass(VOID);
VOID UninitFloatWndImpl(VOID); VOID UninitFloatWndImpl(VOID);
BOOL ShowHideWindow(PFLT_WND FltInfo); BOOL ShowHideWindow(PFLT_WND FltInfo);
/* font.c */
VOID FillFontStyleComboList(HWND hwndCombo);
VOID FillFontSizeComboList(HWND hwndCombo);
/* custcombo.c */
VOID MakeFlatCombo(HWND hwndCombo); VOID MakeFlatCombo(HWND hwndCombo);
#endif /* __IMAGESOFT_PRECOMP_H */ #endif /* __IMAGESOFT_PRECOMP_H */