From e190b46dc6cf35514229b5ff15e48b18981c4f69 Mon Sep 17 00:00:00 2001 From: Damiano Galassi Date: Thu, 7 Apr 2016 11:02:14 +0200 Subject: MacGui: rename 'layout' in HBPreviewView so it doesn't override NSView layout method. --- macosx/HBPreviewView.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/macosx/HBPreviewView.m b/macosx/HBPreviewView.m index 3431a8a65..5a8140d5a 100644 --- a/macosx/HBPreviewView.m +++ b/macosx/HBPreviewView.m @@ -100,20 +100,20 @@ self.pictureLayer.hidden = hidden ; self.backLayer.hidden = hidden || !self.showBorder; - [self layout]; + [self _updatePreviewLayout]; } - (void)setFitToView:(BOOL)fitToView { _fitToView = fitToView; - [self layout]; + [self _updatePreviewLayout]; } - (void)setShowBorder:(BOOL)showBorder { _showBorder = showBorder; self.backLayer.hidden = !showBorder; - [self layout]; + [self _updatePreviewLayout]; } - (void)setFrame:(NSRect)newRect { @@ -125,7 +125,7 @@ [super setFrame:newRect]; } - [self layout]; + [self _updatePreviewLayout]; } - (NSSize)scaledSize:(NSSize)source toFit:(NSSize)destination @@ -154,7 +154,7 @@ /** * Updates the sublayers layout. */ -- (void)layout +- (void)_updatePreviewLayout { // Set the picture size display fields below the Preview Picture NSSize imageSize = NSMakeSize(CGImageGetWidth(self.image), CGImageGetHeight(self.image)); -- cgit v1.2.3