dwindows: mac/dw.m comparison

comparison mac/dw.m @ 1772:5e16351b01d2

Experimental change to use NSBox to draw border of status text widgets on Mac. Probably will take some more tweaking but it should work on 10.5 and 10.8 in addition to 10.6 and 10.7 that the old method supported.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 14 Jul 2012 04:13:59 +0000
parents	bed4320cb0ce
children	da7786b8573f

comparison

equal deleted inserted replaced

-:bed4320cb0ce
+:5e16351b01d2
 range = [view bounds].size.width;
 }
 return range;
 }
+/* Return the handle to the text object */
+id _text_handle(id object)
+{
+if([object isMemberOfClass:[ DWSpinButton class]])
+{
+DWSpinButton *spinbutton = object;
+object = [spinbutton textfield];
+}
+if([object isMemberOfClass:[ NSBox class]])
+{
+NSBox *box = object;
+id content = [box contentView];
+if([content isMemberOfClass:[ DWText class]])
+{
+object = content;
+}
+}
+return object;
+}
 /* Internal function to calculate the widget's required size..
 * These are the general rules for widget sizes:
 *
 * Render/Unspecified: 1x1
 * Scrolled(Container,Tree,MLE): Guessed size clamped to min and max in dw.h
 */
 void _control_size(id handle, int *width, int *height)
 {
 int thiswidth = 1, thisheight = 1, extrawidth = 0, extraheight = 0;
 NSString *nsstr = nil;
-id object = handle;
+id object = _text_handle(handle);
-if([object isMemberOfClass:[ DWSpinButton class]])
-object = [object textfield];
 /* Handle all the different button types */
 if([ object isKindOfClass:[ NSButton class ] ])
 {
 switch([object buttonType])
 {
 /* Tree */
 else if([ object isMemberOfClass:[DWTree class] ])
 {
 thiswidth = (int)((_DW_SCROLLED_MAX_WIDTH + _DW_SCROLLED_MIN_WIDTH)/2);
 thisheight = (int)((_DW_SCROLLED_MAX_HEIGHT + _DW_SCROLLED_MIN_HEIGHT)/2);
 }
 /* Any other control type */
 else if([ object isKindOfClass:[ NSControl class ] ])
 nsstr = [object stringValue];
 /* If we have a string...
 dw_font_text_extents_get(object, NULL, (char *)[nsstr UTF8String], &thiswidth, &thisheight);
 /* Handle static text fields */
 if([object isKindOfClass:[ NSTextField class ]] && ![object isEditable])
 {
+id border = handle;
 /* Handle status bar field */
-if([object isBordered] || (DWOSMinor > 5 && [object isBezeled]))
+if([border isMemberOfClass:[ NSBox class ] ])
 {
 extrawidth = 12;
 extraheight = 4;
 }
 else
 extrawidth = 10;
+//dw_debug("this width %d height %d extra width %d height %d \"%s\"\n", thiswidth, thisheight, extrawidth, extraheight, (char *)[nsstr UTF8String]);
 }
 /* Set the requested sizes */
 if(width)
 *width = thiswidth + extrawidth;
 if(height)
 *height = thisheight + extraheight;
 }
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_status_text_new(char *text, ULONG cid)
 {
+NSBox *border = [[NSBox alloc] init];
 NSTextField *textfield = dw_text_new(text, cid);
-[textfield setBordered:YES];
-if(DWOSMinor > 5 && DWOSMinor < 8)
+[border setBorderType:NSGrooveBorder];
-{
+//[border setBorderType:NSLineBorder];
-[textfield setBezeled:YES];
+[border setTitlePosition:NSNoTitle];
-[textfield setBezelStyle:NSTextFieldSquareBezel];
+[border setContentView:textfield];
-}
+[border setContentViewMargins:NSMakeSize(1,1)];
+[textfield autorelease];
 [textfield setBackgroundColor:[NSColor clearColor]];
 [[textfield cell] setVCenter:YES];
-return textfield;
+return border;
 }
 /*
 * Create a new static text window (widget) to be packed.
 * Parameters:
 {
 NSFont *font = _dw_font_by_name(fontname);
 if(font)
 {
-id object = handle;
+id object = _text_handle(handle);
 if([object window])
 {
 [object lockFocus];
 [font set];
 [object unlockFocus];
 * Parameters:
 *           handle: The window handle from which to obtain the font.
 */
 char * API dw_window_get_font(HWND handle)
 {
-id object = handle;
+id object = _text_handle(handle);
 NSFont *font = nil;
 if([object isMemberOfClass:[DWGroupBox class]])
 {
 font = [object titleFont];
 * Returns:
 *       text: The text associsated with a given window.
 */
 char * API dw_window_get_text(HWND handle)
 {
-NSObject *object = handle;
+id object = _text_handle(handle);
-if([object isMemberOfClass:[ DWSpinButton class]])
-{
-DWSpinButton *spinbutton = handle;
-handle = object = [spinbutton textfield];
-}
 if([ object isKindOfClass:[ NSWindow class ] ] || [ object isKindOfClass:[ NSButton class ] ])
 {
-id window = handle;
+id window = object;
 NSString *nsstr = [ window title];
 return strdup([ nsstr UTF8String ]);
 }
 else if([ object isKindOfClass:[ NSControl class ] ])
 {
-NSControl *control = handle;
+NSControl *control = object;
 NSString *nsstr = [ control stringValue];
 return strdup([ nsstr UTF8String ]);
 }
 return NULL;
 *       handle: Handle to the window.
 *       text: The text associsated with a given window.
 */
 void API dw_window_set_text(HWND handle, char *text)
 {
-id object = handle;
+id object = _text_handle(handle);
-if([object isMemberOfClass:[ DWSpinButton class]])
-{
-DWSpinButton *spinbutton = handle;
-object = [spinbutton textfield];
-}
 if([ object isKindOfClass:[ NSWindow class ] ] || [ object isKindOfClass:[ NSButton class ] ])
 [object setTitle:[ NSString stringWithUTF8String:text ]];
 else if([ object isKindOfClass:[ NSControl class ] ])
 {
-NSControl *control = handle;
+NSControl *control = object;
 [control setStringValue:[ NSString stringWithUTF8String:text ]];
 }
 else if([object isMemberOfClass:[DWGroupBox class]])
 {
-DWGroupBox *groupbox = handle;
+DWGroupBox *groupbox = object;
 [groupbox setTitle:[NSString stringWithUTF8String:text]];
 }
 else
 return;
 /* If we changed the text... */

Mercurial > dwindows

comparison mac/dw.m @ 1772:5e16351b01d2