Mercurial > dwindows
changeset 690:b93f5cdab37d
Fixes to the color picker... it actually shows the picker now but it still needs more work.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Tue, 08 Mar 2011 00:08:25 +0000 |
parents | 4199730e9889 |
children | 578bbfd8c904 |
files | mac/dw.m |
diffstat | 1 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mac/dw.m Mon Mar 07 23:15:55 2011 +0000 +++ b/mac/dw.m Tue Mar 08 00:08:25 2011 +0000 @@ -2420,7 +2420,6 @@ [scrollbar setTag:cid]; [scrollbar setEnabled:YES]; return scrollbar; - } /* @@ -3211,18 +3210,22 @@ */ unsigned long API dw_color_choose(unsigned long value) { - /* Create the File Save Dialog class. */ - DWColorChoose *colorDlg = (DWColorChoose *)[DWColorChoose sharedColorPanel]; + /* Create the File Save Dialog class. */ + DWColorChoose *colorDlg = (DWColorChoose *)[DWColorChoose sharedColorPanel]; NSColor *color = [NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1]; - DWDialog *dialog = dw_dialog_new(colorDlg); + DWDialog *dialog = dw_dialog_new(colorDlg); - /* Set defaults for the dialog. */ - [colorDlg setColor:color]; - [colorDlg setDialog:dialog]; + /* Set defaults for the dialog. */ + [colorDlg setColor:color]; + [colorDlg setDialog:dialog]; + [colorDlg setContinuous:YES]; + [colorDlg setTarget:colorDlg]; + [colorDlg setAction:@selector(changeColor:)]; + [colorDlg makeKeyAndOrderFront:nil]; - color = (NSColor *)dw_dialog_wait(dialog); - [color release]; - return _foreground; + color = (NSColor *)dw_dialog_wait(dialog); + [color release]; + return _foreground; } /* Draw a point on a window (preferably a render window).