Mercurial > dwindows

changeset 739:a0aec9a56914

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Font and color improvements... including implementing dw_window_set_font().
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 16 Mar 2011 01:34:36 +0000
parents 52d5ed00f892
children bb3b2d804f0e
files mac/dw.m
diffstat 1 files changed, 32 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Tue Mar 15 22:32:45 2011 +0000
+++ b/mac/dw.m	Wed Mar 16 01:34:36 2011 +0000
@@ -5783,22 +5783,30 @@
  */
 int API dw_window_set_color(HWND handle, ULONG fore, ULONG back)
 {
-	id object = handle;
-	unsigned long _fore = _get_color(fore);
-	unsigned long _back = _get_color(back);
+    id object = handle;
+    unsigned long _fore = _get_color(fore);
+    unsigned long _back = _get_color(back);
+    NSColor *fg = [NSColor colorWithDeviceRed: DW_RED_VALUE(_fore)/255.0 green: DW_GREEN_VALUE(_fore)/255.0 blue: DW_BLUE_VALUE(_fore)/255.0 alpha: 1];
+    NSColor *bg = [NSColor colorWithDeviceRed: DW_RED_VALUE(_back)/255.0 green: DW_GREEN_VALUE(_back)/255.0 blue: DW_BLUE_VALUE(_back)/255.0 alpha: 1];
 	
-	if([object isMemberOfClass:[NSTextFieldCell class]])
-	{
-		NSTextFieldCell *text = object;
-		[text setTextColor:[NSColor colorWithDeviceRed: DW_RED_VALUE(_fore)/255.0 green: DW_GREEN_VALUE(_fore)/255.0 blue: DW_BLUE_VALUE(_fore)/255.0 alpha: 1]];
-	}
-	else if([object isMemberOfClass:[DWBox class]])
-	{
+    if([object isMemberOfClass:[NSTextFieldCell class]])
+    {
+        NSTextFieldCell *text = object;
+        [text setTextColor:fg];
+    }
+    else if([object isMemberOfClass:[DWBox class]])
+    {
 		DWBox *box = object;
 		
 		[box setColor:_back];
-	}
-	return 0;
+    }
+    else if([object isMemberOfClass:[DWButton class]])
+    {
+        DWButton *button = object;
+        
+        [[button cell] setBackgroundColor:bg];
+    }
+    return 0;
 }
 
 /*
@@ -5973,7 +5981,7 @@
                 [font set];
                 [object unlockFocus];
             }
-            if([object isMemberOfClass:[NSControl class]])
+            if([object isKindOfClass:[NSControl class]])
             {
                 [object setFont:font];
             }
@@ -5990,8 +5998,17 @@
  */
 char * API dw_window_get_font(HWND handle)
 {
-   NSLog(@"dw_window_get_font() unimplemented\n");
-   return "8.Monaco";
+    id object = handle;
+    
+    if([object isKindOfClass:[NSControl class]])
+    {
+        NSControl *control = object;
+        NSFont *font = [control font];
+        NSString *fontname = [font fontName];
+        NSString *output = [NSString stringWithFormat:@"%d.%s", (int)[font pointSize], [fontname UTF8String]];
+        return strdup([output UTF8String]);
+    }
+    return NULL;
 }
 
 /*