From db839f6d6d2124da21016beccbb498385db2517c Mon Sep 17 00:00:00 2001 From: cacaodev Date: Sun, 1 May 2016 19:04:32 +0200 Subject: [PATCH] Rename _lockResizing to _inLiveResize _inLiveResize is a CPView flag. --- AppKit/CPCollectionView.j | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/AppKit/CPCollectionView.j b/AppKit/CPCollectionView.j index cc2e08b99..f64b0e9da 100644 --- a/AppKit/CPCollectionView.j +++ b/AppKit/CPCollectionView.j @@ -132,7 +132,6 @@ var HORIZONTAL_MARGIN = 2; CGSize _storedFrameSize; BOOL _uniformSubviewsResizing @accessors(property=uniformSubviewsResizing); - BOOL _lockResizing; CPInteger _currentDropIndex; CPDragOperation _currentDragOperation; @@ -190,7 +189,7 @@ var HORIZONTAL_MARGIN = 2; _needsMinMaxItemSizeUpdate = YES; _uniformSubviewsResizing = NO; - _lockResizing = NO; + _inLiveResize = NO; _currentDropIndex = -1; _currentDragOperation = CPDragOperationNone; @@ -533,14 +532,14 @@ var HORIZONTAL_MARGIN = 2; - (void)resizeWithOldSuperviewSize:(CGSize)oldBoundsSize { - if (_lockResizing) + if (_inLiveResize) return; - _lockResizing = YES; + _inLiveResize = YES; [self tile]; - _lockResizing = NO; + _inLiveResize = NO; } - (void)tile