mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 06:51:44 +00:00
* Source/GSThemeDrawing.m (-drawScrollViewRect:inView:): Use the
scrollview bounds instead of the scroller frame for drawing the border. Patch by Jeff Teunissen <deek@d2dc.net>. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37438 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
db8253b2d1
commit
004c87b9a5
2 changed files with 15 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
|||
2013-12-07 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/GSThemeDrawing.m (-drawScrollViewRect:inView:): Use the
|
||||
scrollview bounds instead of the scroller frame for drawing the border.
|
||||
Patch by Jeff Teunissen <deek@d2dc.net>.
|
||||
|
||||
2013-12-06 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSBitmapImageRep+JPEG.m: Remove CYGWIN specific define as
|
||||
|
|
|
@ -2622,6 +2622,7 @@ typedef enum {
|
|||
{
|
||||
NSInterfaceStyle style;
|
||||
CGFloat xpos;
|
||||
CGFloat scrollerHeight = bounds.size.height;
|
||||
|
||||
style = NSInterfaceStyleForKey(@"NSScrollViewInterfaceStyle", nil);
|
||||
if (style == NSMacintoshInterfaceStyle
|
||||
|
@ -2634,14 +2635,20 @@ typedef enum {
|
|||
xpos = [vertScroller frame].origin.x + scrollerWidth;
|
||||
}
|
||||
NSRectFill(NSMakeRect(xpos, [vertScroller frame].origin.y - 1.0,
|
||||
1.0, [vertScroller frame].size.height + 1.0));
|
||||
1.0, scrollerHeight + 1.0));
|
||||
}
|
||||
|
||||
if ([scrollView hasHorizontalScroller])
|
||||
{
|
||||
CGFloat ypos;
|
||||
CGFloat scrollerY = [horizScroller frame].origin.y;
|
||||
CGFloat scrollerLength = bounds.size.width;
|
||||
|
||||
if ([scrollView hasVerticalScroller])
|
||||
{
|
||||
scrollerLength -= [NSScroller scrollerWidth];
|
||||
}
|
||||
|
||||
if ([scrollView isFlipped])
|
||||
{
|
||||
ypos = scrollerY - 1.0;
|
||||
|
@ -2651,7 +2658,7 @@ typedef enum {
|
|||
ypos = scrollerY + scrollerWidth + 1.0;
|
||||
}
|
||||
NSRectFill(NSMakeRect([horizScroller frame].origin.x - 1.0, ypos,
|
||||
[horizScroller frame].size.width + 1.0, 1.0));
|
||||
scrollerLength + 1.0, 1.0));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue