gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 20:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

NSScroller: calculate buttonsWidth dyamically based on +scrollerWidth

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@20851 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
arobert 2005-03-05 16:08:30 +00:00
parent b6d9981388
commit 5d2adf7914
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-03-05 Adrian Robert <arobert@cogsci.ucsd.edu>
* Source/NSScroller.m (-checkSpaceForParts, -rectForPart:) Calculate
buttonsWidth variable dynamically based on +scrollerWidth (supports
width override by subclass).
2005-03-05 10:53 Gregory John Casamento <greg_casamento@yahoo.com> 2005-03-05 10:53 Gregory John Casamento <greg_casamento@yahoo.com>
* Headers/AppKit/NSDataLink.h * Headers/AppKit/NSDataLink.h

14
Source/NSScroller.m
View file

@ -57,7 +57,7 @@ static NSButtonCell* rightCell = nil;
static NSButtonCell* knobCell = nil; static NSButtonCell* knobCell = nil;
static const float scrollerWidth = 18; static const float scrollerWidth = 18;
static const float buttonsWidth = 16; static const float buttonsOffset = 2; // buttonsWidth = sw - buttonsOffset
static NSColor *scrollBarColor = nil; static NSColor *scrollBarColor = nil;
@ -73,6 +73,10 @@ static NSColor *scrollBarColor = nil;
} }
} }
/**
* Subclasses can override this to provide different scrollbar width. But
* you may need to also override -drawParts .
*/
+ (float) scrollerWidth + (float) scrollerWidth
{ {
return scrollerWidth; return scrollerWidth;
@ -266,6 +270,12 @@ static NSColor *scrollBarColor = nil;
return [self initWithFrame: NSZeroRect]; return [self initWithFrame: NSZeroRect];
} }
/**
* Cache images for scroll arrows and knob. If you override +scrollerWidth
* you may need to override this as well (to provide images for the new
* width). However, if you do so, you must currently also override
* -drawArrow:highlight: and -drawKnob: .
*/
- (void) drawParts - (void) drawParts
{ {
/* /*
@ -338,6 +348,7 @@ static NSColor *scrollBarColor = nil;
{ {
NSSize frameSize = _frame.size; NSSize frameSize = _frame.size;
float size = (_isHorizontal ? frameSize.width : frameSize.height); float size = (_isHorizontal ? frameSize.width : frameSize.height);
int buttonsWidth = [isa scrollerWidth] - buttonsOffset;
if (_arrowsPosition == NSScrollerArrowsNone) if (_arrowsPosition == NSScrollerArrowsNone)
{ {
@ -911,6 +922,7 @@ static NSColor *scrollBarColor = nil;
NSRect scrollerFrame = _frame; NSRect scrollerFrame = _frame;
float x = 1, y = 1; float x = 1, y = 1;
float width, height; float width, height;
float buttonsWidth = ([isa scrollerWidth] - buttonsOffset);
float buttonsSize = 2 * buttonsWidth + 2; float buttonsSize = 2 * buttonsWidth + 2;
NSUsableScrollerParts usableParts; NSUsableScrollerParts usableParts;
/* /*