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

* Source/GSThemeDrawing.m (-drawScrollViewRect:inView:): Use the

Browse source 
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:
fredkiefer 2013-12-07 20:40:47 +00:00
parent b355e85c95
commit bbfd47efe3
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2013-12-06 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSBitmapImageRep+JPEG.m: Remove CYGWIN specific define as * Source/NSBitmapImageRep+JPEG.m: Remove CYGWIN specific define as

11
Source/GSThemeDrawing.m
View file

@ -2622,6 +2622,7 @@ typedef enum {
{ {
NSInterfaceStyle style; NSInterfaceStyle style;
CGFloat xpos; CGFloat xpos;
CGFloat scrollerHeight = bounds.size.height;
style = NSInterfaceStyleForKey(@"NSScrollViewInterfaceStyle", nil); style = NSInterfaceStyleForKey(@"NSScrollViewInterfaceStyle", nil);
if (style == NSMacintoshInterfaceStyle if (style == NSMacintoshInterfaceStyle
@ -2634,14 +2635,20 @@ typedef enum {
xpos = [vertScroller frame].origin.x + scrollerWidth; xpos = [vertScroller frame].origin.x + scrollerWidth;
} }
NSRectFill(NSMakeRect(xpos, [vertScroller frame].origin.y - 1.0, 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]) if ([scrollView hasHorizontalScroller])
{ {
CGFloat ypos; CGFloat ypos;
CGFloat scrollerY = [horizScroller frame].origin.y; CGFloat scrollerY = [horizScroller frame].origin.y;
CGFloat scrollerLength = bounds.size.width;
if ([scrollView hasVerticalScroller])
{
scrollerLength -= [NSScroller scrollerWidth];
}
if ([scrollView isFlipped]) if ([scrollView isFlipped])
{ {
ypos = scrollerY - 1.0; ypos = scrollerY - 1.0;
@ -2651,7 +2658,7 @@ typedef enum {
ypos = scrollerY + scrollerWidth + 1.0; ypos = scrollerY + scrollerWidth + 1.0;
} }
NSRectFill(NSMakeRect([horizScroller frame].origin.x - 1.0, ypos, NSRectFill(NSMakeRect([horizScroller frame].origin.x - 1.0, ypos,
[horizScroller frame].size.width + 1.0, 1.0)); scrollerLength + 1.0, 1.0));
} }
} }
} }