summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorDamiano Galassi <[email protected]>2016-04-07 11:02:14 +0200
committerDamiano Galassi <[email protected]>2016-04-07 11:02:14 +0200
commite190b46dc6cf35514229b5ff15e48b18981c4f69 (patch)
tree84d9dddd2c92b25285572e7e96c538b9e5e05258 /macosx
parentc214bb8cfef39475e2b7b03987994d001ff97e4d (diff)
MacGui: rename 'layout' in HBPreviewView so it doesn't override NSView layout method.
Diffstat (limited to 'macosx')
-rw-r--r--macosx/HBPreviewView.m10
1 files 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));