Mercurial > dwindows

comparison mac/dw.m @ 1421:63d253a2cdd9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added bitmap autosizing support on Mac.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 03 Dec 2011 00:09:34 +0000
parents fabf23bdc7fb
children 131bedf41332
comparison
equal deleted inserted replaced
1420:fabf23bdc7fb 1421:63d253a2cdd9
3620 { 3620 {
3621 thiswidth = 100; 3621 thiswidth = 100;
3622 thisheight = 14; 3622 thisheight = 14;
3623 } 3623 }
3624 } 3624 }
3625 /* Handle bitmap size */
3626 else if([ object isMemberOfClass:[NSImageView class] ])
3627 {
3628 NSImage *image = [object image];
3629
3630 if(image)
3631 {
3632 NSSize size = [image size];
3633 thiswidth = (int)size.width;
3634 thisheight = (int)size.height;
3635 }
3636 }
3625 else if([ object isKindOfClass:[ NSControl class ] ]) 3637 else if([ object isKindOfClass:[ NSControl class ] ])
3626 nsstr = [object stringValue]; 3638 nsstr = [object stringValue];
3627 3639
3628 /* Handle static text fields */ 3640 /* Handle static text fields */
3629 if([object isKindOfClass:[ NSTextField class ]] && ![object isEditable]) 3641 if([object isKindOfClass:[ NSTextField class ]] && ![object isEditable])
8436 if(pixmap) 8448 if(pixmap)
8437 { 8449 {
8438 [iv setImage:pixmap]; 8450 [iv setImage:pixmap];
8439 } 8451 }
8440 [pixmap release]; 8452 [pixmap release];
8453 /* Queue a redraw on the top-level window */
8454 _dw_redraw([iv window]);
8441 } 8455 }
8442 } 8456 }
8443 8457
8444 /* 8458 /*
8445 * Sets the bitmap used for a given static window. 8459 * Sets the bitmap used for a given static window.
8469 } 8483 }
8470 8484
8471 if(bitmap) 8485 if(bitmap)
8472 { 8486 {
8473 [iv setImage:bitmap]; 8487 [iv setImage:bitmap];
8488 /* Queue a redraw on the top-level window */
8489 _dw_redraw([iv window]);
8474 } 8490 }
8475 } 8491 }
8476 } 8492 }
8477 8493
8478 /* 8494 /*