mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-17 04:00:42 +00:00
Fixed: New Cocoa api that replace old deprecated for calculating content and frame size of scroll view (#3023)
Old deprecated api did not work as it was accessing ivars _horizontalScroller and _verticalScroller from class method. New Cocoa api is added as described in Apple Developer Documentation. Also added type CPScrollerStyle
This commit is contained in:
1 parent
3cf3b76446
commit
68a113e7ee
2 files changed
+47
-12
No files matched your search
+44
-10
@@ -168,20 +168,54 @@ var CPScrollerStyleGlobal = CPScrollerStyleOverlay,
|
||||
};
|
||||
}
|
||||
|
||||
/*! Deprecated
|
||||
*/
|
||||
+ (CGSize)contentSizeForFrameSize:(CGSize)frameSize hasHorizontalScroller:(BOOL)hFlag hasVerticalScroller:(BOOL)vFlag borderType:(CPBorderType)borderType
|
||||
{
|
||||
return [self contentSizeForFrameSize:frameSize
|
||||
horizontalScrollerClass:hFlag ? [CPScroller class] : nil
|
||||
verticalScrollerClass:vFlag ? [CPScroller class] : nil
|
||||
borderType:borderType
|
||||
controlSize:CPRegularControlSize
|
||||
scrollerStyle:CPScrollerStyleGlobal];
|
||||
}
|
||||
|
||||
+ (CGSize)contentSizeForFrameSize:(CGSize)frameSize
|
||||
horizontalScrollerClass:(Class)horizontalScrollerClass
|
||||
verticalScrollerClass:(Class)verticalScrollerClass
|
||||
borderType:(CPBorderType)borderType
|
||||
controlSize:(CPControlSize)controlSize
|
||||
scrollerStyle:(CPScrollerStyle)scrollerStyle
|
||||
{
|
||||
var bounds = [self _insetBounds:CGRectMake(0.0, 0.0, frameSize.width, frameSize.height) borderType:borderType];
|
||||
|
||||
if (hFlag)
|
||||
bounds.size.height -= [_horizontalScroller scrollerWidth];
|
||||
if (horizontalScrollerClass)
|
||||
bounds.size.height -= [horizontalScrollerClass scrollerWidthInStyle:scrollerStyle];
|
||||
|
||||
if (vFlag)
|
||||
bounds.size.width -= [_verticalScroller scrollerWidth];
|
||||
if (verticalScrollerClass)
|
||||
bounds.size.width -= [verticalScrollerClass scrollerWidthForControlSize:scrollerStyle];
|
||||
|
||||
return bounds.size;
|
||||
}
|
||||
|
||||
/*! Deprecated
|
||||
*/
|
||||
+ (CGSize)frameSizeForContentSize:(CGSize)contentSize hasHorizontalScroller:(BOOL)hFlag hasVerticalScroller:(BOOL)vFlag borderType:(CPBorderType)borderType
|
||||
{
|
||||
return [self frameSizeForContentSize:contentSize
|
||||
horizontalScrollerClass:hFlag ? [CPScroller class] : nil
|
||||
verticalScrollerClass:vFlag ? [CPScroller class] : nil
|
||||
borderType:borderType
|
||||
controlSize:CPRegularControlSize
|
||||
scrollerStyle:CPScrollerStyleGlobal];
|
||||
}
|
||||
|
||||
+ (CGSize)frameSizeForContentSize:(CGSize)contentSize
|
||||
horizontalScrollerClass:(Class)horizontalScrollerClass
|
||||
verticalScrollerClass:(Class)verticalScrollerClass
|
||||
borderType:(CPBorderType)borderType
|
||||
controlSize:(CPControlSize)controlSize
|
||||
scrollerStyle:(CPScrollerStyle)scrollerStyle
|
||||
{
|
||||
var bounds = [self _insetBounds:CGRectMake(0.0, 0.0, contentSize.width, contentSize.height) borderType:borderType],
|
||||
widthInset = contentSize.width - bounds.size.width,
|
||||
@@ -189,10 +223,10 @@ var CPScrollerStyleGlobal = CPScrollerStyleOverlay,
|
||||
frameSize = CGSizeMake(contentSize.width + widthInset, contentSize.height + heightInset);
|
||||
|
||||
if (hFlag)
|
||||
frameSize.height += [_horizontalScroller scrollerWidth];
|
||||
frameSize.height += [horizontalScrollerClass scrollerWidthInStyle:scrollerStyle];
|
||||
|
||||
if (vFlag)
|
||||
frameSize.width += [_verticalScroller scrollerWidth];
|
||||
frameSize.width += [verticalScrollerClass scrollerWidthForControlSize:scrollerStyle];
|
||||
|
||||
return frameSize;
|
||||
}
|
||||
@@ -220,7 +254,7 @@ var CPScrollerStyleGlobal = CPScrollerStyleOverlay,
|
||||
/*!
|
||||
Get the system wide scroller style.
|
||||
*/
|
||||
+ (int)globalScrollerStyle
|
||||
+ (CPScrollerStyle)globalScrollerStyle
|
||||
{
|
||||
return CPScrollerStyleGlobal;
|
||||
}
|
||||
@@ -230,7 +264,7 @@ var CPScrollerStyleGlobal = CPScrollerStyleOverlay,
|
||||
|
||||
@param aStyle the scroller style to set all scroller views to use (CPScrollerStyleLegacy or CPScrollerStyleOverlay)
|
||||
*/
|
||||
+ (void)setGlobalScrollerStyle:(int)aStyle
|
||||
+ (void)setGlobalScrollerStyle:(CPScrollerStyle)aStyle
|
||||
{
|
||||
CPScrollerStyleGlobal = aStyle;
|
||||
[[CPNotificationCenter defaultCenter] postNotificationName:CPScrollerStyleGlobalChangeNotification object:nil];
|
||||
@@ -321,7 +355,7 @@ Notifies the delegate when the scroll view has finished scrolling.
|
||||
_implementedDelegateMethods |= CPScrollViewDelegate_scrollViewDidScroll_;
|
||||
}
|
||||
|
||||
- (int)scrollerStyle
|
||||
- (CPScrollerStyle)scrollerStyle
|
||||
{
|
||||
return _scrollerStyle;
|
||||
}
|
||||
@@ -332,7 +366,7 @@ Notifies the delegate when the scroll view has finished scrolling.
|
||||
- CPScrollerStyleLegacy: Standard scrollers like Windows or Mac OS X prior to 10.7
|
||||
- CPScrollerStyleOverlay: scrollers like those in Mac OS X 10.7+
|
||||
*/
|
||||
- (void)setScrollerStyle:(int)aStyle
|
||||
- (void)setScrollerStyle:(CPScrollerStyle)aStyle
|
||||
{
|
||||
if (_scrollerStyle === aStyle)
|
||||
return;
|
||||
|
||||
+3
-2
@@ -62,6 +62,7 @@ NAMES_FOR_PARTS[CPScrollerKnobSlot] = @"knob-slot";
|
||||
NAMES_FOR_PARTS[CPScrollerKnob] = @"knob";
|
||||
|
||||
|
||||
@typedef CPScrollerStyle
|
||||
CPScrollerStyleLegacy = 0;
|
||||
CPScrollerStyleOverlay = 1;
|
||||
|
||||
@@ -134,7 +135,7 @@ CPThemeStateScrollerKnobDark = CPThemeState("scroller-knob-dark");
|
||||
/*!
|
||||
Returns the CPScroller's width for a CPRegularControlSize.
|
||||
*/
|
||||
+ (float)scrollerWidthInStyle:(int)aStyle
|
||||
+ (float)scrollerWidthInStyle:(CPScrollerStyle)aStyle
|
||||
{
|
||||
if (!_CACHED_THEME_SCROLLER)
|
||||
_CACHED_THEME_SCROLLER = [[self alloc] init];
|
||||
@@ -217,7 +218,7 @@ CPThemeStateScrollerKnobDark = CPThemeState("scroller-knob-dark");
|
||||
Set the scroller's control size
|
||||
@param aStyle the scroller style: CPScrollerStyleLegacy or CPScrollerStyleOverlay
|
||||
*/
|
||||
- (void)setStyle:(id)aStyle
|
||||
- (void)setStyle:(CPScrollerStyle)aStyle
|
||||
{
|
||||
if (_style != nil && _style === aStyle)
|
||||
return;
|
||||
|
||||
Reference in new issue
Block a user