Minor Metal backend cleanups and improvements

OpenSmalltalk · Mar 2, 2020 · c25b871 · c25b871
1 parent 0818124
commit c25b871
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXMetalView.m b/platforms/iOS/vm/OSX/sqSqueakOSXMetalView.m
@@ -127,7 +127,7 @@ + (BOOL) isMetalViewSupported {
 #pragma mark Initialization / Release
 
 - (id)initWithFrame:(NSRect)frameRect {
-    self = [self initWithFrame: NSRectToCGRect(frameRect) device: MTLCreateSystemDefaultDevice()];
+	self = [super initWithFrame:frameRect];
 
     [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     [self setAutoresizesSubviews:YES];
@@ -138,6 +138,7 @@ - (id)initWithFrame:(NSRect)frameRect {
 }
 
 - (void)awakeFromNib {
+	[super awakeFromNib];
     [self initialize];
 }
 
@@ -323,7 +324,7 @@ -(void)drawRect:(NSRect)rect
 	[self setupMetal];
     [self setupFullScreendispBitsIndex];
 
-	// Alawys try to fill the texture with the pixels.
+	// Always try to fill the texture with the pixels.
 	if ( fullScreendispBitsIndex ) {
 		[self loadTexturesFrom: fullScreendispBitsIndex subRectangle: (clippyIsEmpty ? rect : NSRectFromCGRect(clippy))];
 		//[self loadTexturesFrom: fullScreendispBitsIndex subRectangle: rect];
@@ -724,39 +725,39 @@ - (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replaceme
 	inputSelection= NSMakeRange(NSNotFound, 0);
 }
 
-- (void)		 unmarkText {
+- (void)unmarkText {
 	inputMark= NSMakeRange(NSNotFound, 0);
 }
 
-- (BOOL)		 hasMarkedText {
+- (BOOL)hasMarkedText {
 	return inputMark.location != NSNotFound;
 }
 
-- (NSInteger)		 conversationIdentifier	{
+- (NSInteger)conversationIdentifier	{
 	return (NSInteger )self;
 }
 
 - (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange {
 	return nil;
 }
 
-- (NSRange)		 markedRange {
+- (NSRange)markedRange {
 	return inputMark;
 }
 
-- (NSRange)		 selectedRange {
+- (NSRange)selectedRange {
 	return inputSelection;
 }
 
 - (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange {
 	return NSMakeRect(0,0, 0,0);
 }
 
-- (NSUInteger) characterIndexForPoint: (NSPoint)thePoint {
+- (NSUInteger)characterIndexForPoint: (NSPoint)thePoint {
 	return 0;
 }
 
-- (NSArray *) validAttributesForMarkedText {
+- (NSArray *)validAttributesForMarkedText {
 	return nil;
 }
 
@@ -940,7 +941,6 @@ - (void) setExtraLayer: (unsigned int) handle texture: (id<MTLTexture>) texture
 	return mainMetalView ? mainMetalView.device : nil;
 }
 
-
 id<MTLCommandQueue>
 getMainWindowMetalCommandQueue(void) {
 	return mainMetalView ? mainMetalView.graphicsCommandQueue : nil;