mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-30 12:00:39 +00:00
Updated and simplified code for the fact we no longer flush the window
in NSHighlightRect() git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13680 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
3b8bc8cd5e
commit
68a815cb1b
1 changed files with 7 additions and 44 deletions
|
@ -347,13 +347,7 @@
|
||||||
|| (NSMaxY(r) < NSMinY(oldRect)))
|
|| (NSMaxY(r) < NSMinY(oldRect)))
|
||||||
// the two rects don't intersect
|
// the two rects don't intersect
|
||||||
{
|
{
|
||||||
DPScompositerect(GSCurrentContext(),
|
NSHighlightRect(oldRect);
|
||||||
NSMinX(oldRect),
|
|
||||||
NSMinY(oldRect),
|
|
||||||
NSWidth(oldRect),
|
|
||||||
NSHeight(oldRect),
|
|
||||||
NSCompositeHighlight);
|
|
||||||
// NSHighlightRect(oldRect);
|
|
||||||
NSHighlightRect(r);
|
NSHighlightRect(r);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -375,14 +369,7 @@
|
||||||
onRect.size.height =
|
onRect.size.height =
|
||||||
NSMaxY(r) - NSMaxY(oldRect);
|
NSMaxY(r) - NSMaxY(oldRect);
|
||||||
|
|
||||||
// NSHighlightRect(onRect);
|
NSHighlightRect(onRect);
|
||||||
DPScompositerect(GSCurrentContext(),
|
|
||||||
NSMinX(onRect),
|
|
||||||
NSMinY(onRect),
|
|
||||||
NSWidth(onRect),
|
|
||||||
NSHeight(onRect),
|
|
||||||
NSCompositeHighlight);
|
|
||||||
|
|
||||||
NSHighlightRect(offRect);
|
NSHighlightRect(offRect);
|
||||||
|
|
||||||
//NSLog(@"on : %@", NSStringFromRect(onRect));
|
//NSLog(@"on : %@", NSStringFromRect(onRect));
|
||||||
|
@ -406,14 +393,7 @@
|
||||||
onRect.size.height =
|
onRect.size.height =
|
||||||
NSMinY(oldRect) - NSMinY(r);
|
NSMinY(oldRect) - NSMinY(r);
|
||||||
|
|
||||||
// NSHighlightRect(onRect);
|
NSHighlightRect(onRect);
|
||||||
DPScompositerect(GSCurrentContext(),
|
|
||||||
NSMinX(onRect),
|
|
||||||
NSMinY(onRect),
|
|
||||||
NSWidth(onRect),
|
|
||||||
NSHeight(onRect),
|
|
||||||
NSCompositeHighlight);
|
|
||||||
|
|
||||||
NSHighlightRect(offRect);
|
NSHighlightRect(offRect);
|
||||||
|
|
||||||
//NSLog(@"on : %@", NSStringFromRect(onRect));
|
//NSLog(@"on : %@", NSStringFromRect(onRect));
|
||||||
|
@ -429,12 +409,7 @@
|
||||||
|| (NSMaxX(r) < NSMinX(oldRect)))
|
|| (NSMaxX(r) < NSMinX(oldRect)))
|
||||||
// the two rects don't intersect
|
// the two rects don't intersect
|
||||||
{
|
{
|
||||||
DPScompositerect(GSCurrentContext(),
|
NSHighlightRect (oldRect);
|
||||||
NSMinX(oldRect),
|
|
||||||
NSMinY(oldRect),
|
|
||||||
NSWidth(oldRect),
|
|
||||||
NSHeight(oldRect),
|
|
||||||
NSCompositeHighlight);
|
|
||||||
NSHighlightRect(r);
|
NSHighlightRect(r);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -456,13 +431,7 @@
|
||||||
onRect.size.width =
|
onRect.size.width =
|
||||||
NSMaxX(r) - NSMaxX(oldRect);
|
NSMaxX(r) - NSMaxX(oldRect);
|
||||||
|
|
||||||
DPScompositerect(GSCurrentContext(),
|
NSHighlightRect(onRect);
|
||||||
NSMinX(onRect),
|
|
||||||
NSMinY(onRect),
|
|
||||||
NSWidth(onRect),
|
|
||||||
NSHeight(onRect),
|
|
||||||
NSCompositeHighlight);
|
|
||||||
// NSHighlightRect(onRect);
|
|
||||||
NSHighlightRect(offRect);
|
NSHighlightRect(offRect);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -481,14 +450,7 @@
|
||||||
onRect.size.width =
|
onRect.size.width =
|
||||||
NSMinX(oldRect) - NSMinX(r);
|
NSMinX(oldRect) - NSMinX(r);
|
||||||
|
|
||||||
DPScompositerect(GSCurrentContext(),
|
NSHighlightRect(onRect);
|
||||||
NSMinX(onRect),
|
|
||||||
NSMinY(onRect),
|
|
||||||
NSWidth(onRect),
|
|
||||||
NSHeight(onRect),
|
|
||||||
NSCompositeHighlight);
|
|
||||||
|
|
||||||
// NSHighlightRect(onRect);
|
|
||||||
NSHighlightRect(offRect);
|
NSHighlightRect(offRect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -499,6 +461,7 @@
|
||||||
{
|
{
|
||||||
NSHighlightRect(r);
|
NSHighlightRect(r);
|
||||||
}
|
}
|
||||||
|
[_window flushWindow];
|
||||||
/*
|
/*
|
||||||
if (lit == YES)
|
if (lit == YES)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue