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

Fixes for flipped views

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3996 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-03-30 13:59:35 +00:00
parent 904ce60132
commit 2add338172
5 changed files with 107 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Source/NSScrollView.m
View file

@ -151,7 +151,7 @@ static Class rulerViewClass = nil;
//
// Instance methods
//
- initWithFrame: (NSRect)rect
- (id) initWithFrame: (NSRect)rect
{
[super initWithFrame: rect];
[self setContentView: [[NSClipView new] autorelease]];
@ -164,7 +164,7 @@ static Class rulerViewClass = nil;
return self;
}
- init
- (id) init
{
return [self initWithFrame: NSZeroRect];
}
@ -181,6 +181,11 @@ static Class rulerViewClass = nil;
[super dealloc];
}
- (BOOL) isFlipped
{
return YES;
}
- (void) setContentView: (NSClipView*)aView
{
ASSIGN((id)_contentView, (id)aView);
@ -479,7 +484,14 @@ static Class rulerViewClass = nil;
horizScrollerRect.size.width = contentRect.size.width;
horizScrollerRect.size.height = scrollerWidth;
contentRect.origin.y += scrollerWidth + 1;
if ([self isFlipped])
{
horizScrollerRect.origin.y += contentRect.size.height + 1;
}
else
{
contentRect.origin.y += scrollerWidth + 1;
}
}
[_horizScroller setFrame: horizScrollerRect];
@ -494,6 +506,7 @@ static Class rulerViewClass = nil;
- (void) drawRect: (NSRect)rect
{
NSGraphicsContext *ctxt = [NSGraphicsContext currentContext];
float scrollerWidth = [NSScroller scrollerWidth];
float horizLinePosition, horizLineLength = [self bounds].size.width;
float borderThickness = 0;
@ -503,7 +516,7 @@ static Class rulerViewClass = nil;
// rect.origin.x, rect.origin.y,
// rect.size.width, rect.size.height);
PSgsave ();
DPSgsave(ctxt);
switch ([self borderType])
{
case NSNoBorder:
@ -511,41 +524,45 @@ static Class rulerViewClass = nil;
case NSLineBorder:
borderThickness = 1;
NSFrameRect (rect);
NSFrameRect(rect);
break;
case NSBezelBorder:
borderThickness = 2;
NSDrawGrayBezel (rect, rect);
NSDrawGrayBezel(rect, rect);
break;
case NSGrooveBorder:
borderThickness = 2;
NSDrawGroove (rect, rect);
NSDrawGroove(rect, rect);
break;
}
horizLinePosition = borderThickness;
PSsetlinewidth (1);
PSsetgray (0);
DPSsetlinewidth(ctxt, 1);
DPSsetgray(ctxt, 0);
if (_hasVertScroller)
{
horizLinePosition = scrollerWidth + borderThickness;
horizLineLength -= scrollerWidth + 2 * borderThickness;
PSmoveto (horizLinePosition, borderThickness + 1);
PSrlineto (0, [self bounds].size.height - 2 * borderThickness);
PSstroke ();
DPSmoveto(ctxt, horizLinePosition, borderThickness + 1);
DPSrlineto(ctxt, 0, [self bounds].size.height - 2 * borderThickness - 1);
DPSstroke(ctxt);
}
if (_hasHorizScroller)
{
PSmoveto (horizLinePosition, scrollerWidth + borderThickness + 1);
PSrlineto (horizLineLength - 1, 0);
PSstroke ();
float ypos = scrollerWidth + borderThickness + 1;
if ([self isFlipped])
ypos = [self bounds].size.height - ypos;
DPSmoveto(ctxt, horizLinePosition, ypos);
DPSrlineto(ctxt, horizLineLength - 1, 0);
DPSstroke(ctxt);
}
PSgrestore ();
DPSgrestore(ctxt);
}
- (NSRect) documentVisibleRect