mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-16 11:40:42 +00:00
support for system wide scroller style. Set default to legacy mode in info.plist
This commit is contained in:
1 parent
2742e3d77b
commit
2cfb171b38
3 files changed
+48
-5
No files matched your search
+46
-3
@@ -24,12 +24,13 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
@import <Foundation/CPNotificationCenter.j>
|
||||
|
||||
@import "CPBox.j"
|
||||
@import "CPClipView.j"
|
||||
@import "CPScroller.j"
|
||||
@import "CPView.j"
|
||||
|
||||
|
||||
/*!
|
||||
@ingroup appkit
|
||||
@class CPScrollView
|
||||
@@ -45,6 +46,10 @@ var TIMER_INTERVAL = 0.2,
|
||||
|
||||
|
||||
|
||||
var CPScrollerStyleDefault = CPScrollerStyleOverlay,
|
||||
CPScrollerStyleDefaultChangeNotification = @"CPScrollerStyleDefaultChangeNotification";
|
||||
|
||||
|
||||
@implementation CPScrollView : CPView
|
||||
{
|
||||
CPClipView _contentView;
|
||||
@@ -82,6 +87,11 @@ var TIMER_INTERVAL = 0.2,
|
||||
#pragma mark -
|
||||
#pragma mark Class methods
|
||||
|
||||
+ (void)initialize
|
||||
{
|
||||
CPScrollerStyleDefault = [[CPBundle bundleForClass:CPScrollView] objectForInfoDictionaryKey:@"CPScrollersDefaultStyle"];
|
||||
}
|
||||
|
||||
+ (CPString)defaultThemeClass
|
||||
{
|
||||
return @"scrollview"
|
||||
@@ -146,6 +156,22 @@ var TIMER_INTERVAL = 0.2,
|
||||
}
|
||||
}
|
||||
|
||||
/*! Get the current system wide default for scrollers style
|
||||
*/
|
||||
+ (int)currentDefaultScrollerStyle
|
||||
{
|
||||
return CPScrollerStyleDefault;
|
||||
}
|
||||
|
||||
/*! Set the current system wide default for scrollers style
|
||||
@param aStyle the scroller style you want to use as default
|
||||
*/
|
||||
+ (int)setCurrentDefaultScrollerStyle:(int)aStyle
|
||||
{
|
||||
CPScrollerStyleDefault = aStyle;
|
||||
[[CPNotificationCenter defaultCenter] postNotificationName:CPScrollerStyleDefaultChangeNotification object:nil];
|
||||
}
|
||||
|
||||
|
||||
#pragma mark -
|
||||
#pragma mark Initialization
|
||||
@@ -176,11 +202,16 @@ var TIMER_INTERVAL = 0.2,
|
||||
[self setHasVerticalScroller:YES];
|
||||
[self setHasHorizontalScroller:YES];
|
||||
_scrollerKnobStyle = CPScrollerKnobStyleDefault;
|
||||
[self setScrollerStyle:CPScrollerStyleOverlay];
|
||||
[self setScrollerStyle:CPScrollerStyleDefault];
|
||||
|
||||
_delegate = nil;
|
||||
_scrollTimer = nil;
|
||||
_implementedDelegateMethods = 0;
|
||||
|
||||
[[CPNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(_didReceiveDefaultStyleChange:)
|
||||
name:CPScrollerStyleDefaultChangeNotification
|
||||
object:nil];
|
||||
}
|
||||
|
||||
return self;
|
||||
@@ -907,6 +938,13 @@ var TIMER_INTERVAL = 0.2,
|
||||
[_delegate scrollViewDidScroll:self];
|
||||
}
|
||||
|
||||
/*! @ignore*/
|
||||
- (void)_didReceiveDefaultStyleChange:(CPNotification)aNotification
|
||||
{
|
||||
[self setScrollerStyle:CPScrollerStyleDefault];
|
||||
}
|
||||
|
||||
|
||||
|
||||
#pragma mark -
|
||||
#pragma mark Utilities
|
||||
@@ -1341,8 +1379,13 @@ var CPScrollViewContentViewKey = @"CPScrollViewContentView",
|
||||
// Due to the anything goes nature of decoding, our subviews may not exist yet, so layout at the end of the run loop when we're sure everything is in a correct state.
|
||||
[[CPRunLoop currentRunLoop] performSelector:@selector(_updateCornerAndHeaderView) target:self argument:_contentView order:0 modes:[CPDefaultRunLoopMode]];
|
||||
|
||||
[self setScrollerStyle:[aCoder decodeIntForKey:CPScrollViewScrollerStyleKey] || CPScrollerStyleOverlay];
|
||||
[self setScrollerStyle:[aCoder decodeIntForKey:CPScrollViewScrollerStyleKey] || CPScrollerStyleDefault];
|
||||
[self setScrollerKnobStyle:[aCoder decodeIntForKey:CPScrollViewScrollerKnobStyleKey] || CPScrollerKnobStyleDefault];
|
||||
|
||||
[[CPNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(_didReceiveDefaultStyleChange:)
|
||||
name:CPScrollerStyleDefaultChangeNotification
|
||||
object:nil];
|
||||
}
|
||||
|
||||
return self;
|
||||
|
||||
@@ -67,7 +67,6 @@ CPThemeStateScrollViewLegacy = CPThemeState("scroller-style-legacy");
|
||||
CPThemeStateScrollerKnobLight = CPThemeState("scroller-knob-light");
|
||||
CPThemeStateScrollerKnobDark = CPThemeState("scroller-knob-dark");
|
||||
|
||||
|
||||
@implementation CPScroller : CPControl
|
||||
{
|
||||
CPControlSize _controlSize;
|
||||
@@ -148,7 +147,6 @@ CPThemeStateScrollerKnobDark = CPThemeState("scroller-knob-dark");
|
||||
*/
|
||||
+ (float)scrollerWidthForControlSize:(CPControlSize)aControlSize
|
||||
{
|
||||
// ?? a class method using self?
|
||||
return [self scrollerWidth];
|
||||
}
|
||||
|
||||
|
||||
@@ -10,5 +10,7 @@
|
||||
<string>AppKit</string>
|
||||
<key>CPBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CPScrollersDefaultStyle</key>
|
||||
<integer>0</integer>
|
||||
</dict>
|
||||
</plist>
|
||||
Reference in new issue
Block a user