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

more fixyps for breakage in recent drawing changes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28855 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2009-10-19 18:46:44 +00:00
parent 8d15c4b1e3
commit 582746d0fa
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -2,6 +2,7 @@
* Source/GSThemeTools.m: Fix broken drawing due to error in * Source/GSThemeTools.m: Fix broken drawing due to error in
the ([-validateTilesSizeWithImage:]) method. the ([-validateTilesSizeWithImage:]) method.
Fix broken ([-drawCornersRect:]) too.
2009-10-19 Richard Frith-Macdonald <rfm@gnu.org> 2009-10-19 Richard Frith-Macdonald <rfm@gnu.org>

22
Source/GSThemeTools.m
View file

@ -1521,7 +1521,6 @@ withRepeatedImage: (NSImage*)image
NSSize tls = rects[TileTL].size; NSSize tls = rects[TileTL].size;
NSSize trs = rects[TileTR].size; NSSize trs = rects[TileTR].size;
NSSize brs = rects[TileBR].size; NSSize brs = rects[TileBR].size;
NSRect r;
NSPoint p; NSPoint p;
p = NSMakePoint (rect.origin.x, p = NSMakePoint (rect.origin.x,
@ -1530,20 +1529,19 @@ withRepeatedImage: (NSImage*)image
{ {
p.y = rect.origin.y + tls.height; p.y = rect.origin.y + tls.height;
} }
r = NSMakeRect(0, 0, rects[TileTL].size.width, rects[TileTL].size.height);
[images[TileTL] compositeToPoint: p [images[TileTL] compositeToPoint: p
fromRect: r fromRect: rects[TileTL]
operation: NSCompositeSourceOver]; operation: NSCompositeSourceOver];
// Is this right?
p = NSMakePoint(rect.origin.x + rect.size.width - trs.width + 1, // p = NSMakePoint(rect.origin.x + rect.size.width - trs.width + 1,
p = NSMakePoint(rect.origin.x + rect.size.width - trs.width,
rect.origin.y + rect.size.height - trs.height); rect.origin.y + rect.size.height - trs.height);
if (flipped) if (flipped)
{ {
p.y = rect.origin.y + tls.height; p.y = rect.origin.y + tls.height;
} }
r = NSMakeRect(0, 0, rects[TileTR].size.width, rects[TileTR].size.height);
[images[TileTR] compositeToPoint: p [images[TileTR] compositeToPoint: p
fromRect: r fromRect: rects[TileTR]
operation: NSCompositeSourceOver]; operation: NSCompositeSourceOver];
p = NSMakePoint(rect.origin.x, rect.origin.y); p = NSMakePoint(rect.origin.x, rect.origin.y);
@ -1551,20 +1549,20 @@ withRepeatedImage: (NSImage*)image
{ {
p.y = rect.origin.y + rect.size.height; p.y = rect.origin.y + rect.size.height;
} }
r = NSMakeRect(0, 0, rects[TileBL].size.width, rects[TileBL].size.height);
[images[TileBL] compositeToPoint: p [images[TileBL] compositeToPoint: p
fromRect: r fromRect: rects[TileBL]
operation: NSCompositeSourceOver]; operation: NSCompositeSourceOver];
p = NSMakePoint(rect.origin.x + rect.size.width - brs.width + 1, // Is this right?
// p = NSMakePoint(rect.origin.x + rect.size.width - brs.width + 1,
p = NSMakePoint(rect.origin.x + rect.size.width - brs.width,
rect.origin.y); rect.origin.y);
if (flipped) if (flipped)
{ {
p.y = rect.origin.y + rect.size.height; p.y = rect.origin.y + rect.size.height;
} }
r = NSMakeRect(0, 0, rects[TileBR].size.width, rects[TileBR].size.height);
[images[TileBR] compositeToPoint: p [images[TileBR] compositeToPoint: p
fromRect: r fromRect: rects[TileBR]
operation: NSCompositeSourceOver]; operation: NSCompositeSourceOver];
} }