replacing deprecated methods

This commit is contained in:
Stefan Csomor
2020-06-30 10:20:37 +02:00
parent 1d67ef6cef
commit 6b460d64a8

View File

@@ -142,7 +142,6 @@
{ {
imageSize.width *= labelSize.height/imageSize.height; imageSize.width *= labelSize.height/imageSize.height;
imageSize.height *= labelSize.height/imageSize.height; imageSize.height *= labelSize.height/imageSize.height;
[m_image setScalesWhenResized:YES];
[m_image setSize: imageSize]; [m_image setSize: imageSize];
} }
labelSize.width += imageSize.width; labelSize.width += imageSize.width;
@@ -153,9 +152,19 @@
if(m_image) if(m_image)
{ {
NSSize imageSize = [m_image size]; NSSize imageSize = [m_image size];
[m_image compositeToPoint:NSMakePoint(tabRect.origin.x, NSAffineTransform* imageTransform = [NSAffineTransform transform];
tabRect.origin.y+imageSize.height) if( [[self view] isFlipped] )
operation:NSCompositeSourceOver]; {
[imageTransform translateXBy:tabRect.origin.x yBy:tabRect.origin.y+imageSize.height];
[imageTransform scaleXBy:1.0 yBy:-1.0];
[imageTransform concat];
}
[m_image drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
if( [[self view] isFlipped] )
{
[imageTransform invert];
[imageTransform concat];
}
tabRect.size.width -= imageSize.width; tabRect.size.width -= imageSize.width;
tabRect.origin.x += imageSize.width; tabRect.origin.x += imageSize.width;
} }
@@ -165,6 +174,7 @@
{ {
return m_image; return m_image;
} }
- (void)setImage:(NSImage*)image - (void)setImage:(NSImage*)image
{ {
[image retain]; [image retain];
@@ -173,6 +183,7 @@
if(!m_image) if(!m_image)
return; return;
} }
@end // implementation WXCTabViewImageItem : NSTabViewItem @end // implementation WXCTabViewImageItem : NSTabViewItem