i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* just realized a bug already when reading over the commit log...

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21666 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2007-07-19 17:16:54 +00:00
parent 582da17386
commit ed2254308b
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Region.h
+2
View File
@@ -82,6 +82,8 @@ class BRegion {
clipping_rect _Convert(const BRect& rect) const; clipping_rect _Convert(const BRect& rect) const;
clipping_rect _ConvertToInternal(const BRect& rect) const; clipping_rect _ConvertToInternal(const BRect& rect) const;
clipping_rect _ConvertToInternal(
const clipping_rect& rect) const;
private: private:
long fCount; long fCount;
src/kits/game/DirectWindow.cpp
+6 -4
View File
@@ -307,10 +307,12 @@ BDirectWindow::GetClippingRegion(BRegion *region, BPoint *origin) const
UnlockDirect(); UnlockDirect();
return B_NO_MEMORY; return B_NO_MEMORY;
} }
region->fCount = fBufferDesc->clip_list_count; region->fCount = fBufferDesc->clip_list_count;
region->fBounds = fBufferDesc->clip_bounds; region->fBounds = region->_ConvertToInternal(fBufferDesc->clip_bounds);
for (uint32 c = 0; c < fBufferDesc->clip_list_count; c++) for (uint32 c = 0; c < fBufferDesc->clip_list_count; c++) {
region->fData[c] = fBufferDesc->clip_list[c]; region->fData[c] = region->_ConvertToInternal(
fBufferDesc->clip_list[c]);
}
// adjust bounds by the given origin point // adjust bounds by the given origin point
region->OffsetBy(-originX, -originY); region->OffsetBy(-originX, -originY);
src/kits/interface/Region.cpp
+8
View File
@@ -502,3 +502,11 @@ BRegion::_ConvertToInternal(const BRect& rect) const
(int)ceilf(rect.right) + 1, (int)ceilf(rect.bottom) + 1 }; (int)ceilf(rect.right) + 1, (int)ceilf(rect.bottom) + 1 };
} }
clipping_rect
BRegion::_ConvertToInternal(const clipping_rect& rect) const
{
return (clipping_rect){ rect.left, rect.top,
rect.right + 1, rect.bottom + 1 };
}