unify a little bit more iOS & MacOS

This commit is contained in:
Carlos Aragones
2020-05-17 19:48:59 +02:00
parent 75de20e4cc
commit 80a7a33b7c
9 changed files with 146 additions and 131 deletions

View File

@@ -24,9 +24,9 @@
{
[self setOpaque:YES];
[self setBackgroundColor:[NSColor clearColor]];
self.delegate = self;
self->window_data = windowData;
OSXView *view = (OSXView *) self->childContentView.superview;
view->window_data = windowData;
@@ -59,12 +59,12 @@
NSSize childBoundsSize = [childContentView bounds].size;
sizeDelta.width -= childBoundsSize.width;
sizeDelta.height -= childBoundsSize.height;
OSXView *frameView = [super contentView];
NSSize newFrameSize = [frameView bounds].size;
newFrameSize.width += sizeDelta.width;
newFrameSize.height += sizeDelta.height;
[super setContentSize:newFrameSize];
}
@@ -164,7 +164,7 @@
if(window_data != 0x0) {
NSString *characters;
NSUInteger length;
NSUInteger length;
if ([string isKindOfClass:[NSAttributedString class]])
characters = [string string];
@@ -212,10 +212,10 @@
if (!frameView)
{
frameView = [[[OSXView alloc] initWithFrame:bounds] autorelease];
[super setContentView:frameView];
}
if (childContentView)
{
[childContentView removeFromSuperview];