Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer invalidates the view when an overlay bitmap is updated.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17319 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-05-04 11:21:36 +00:00
parent f8915230d5
commit fe19cff624
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/servers/app/ServerBitmap.h
View File

@ -67,7 +67,7 @@ class ServerBitmap {
uint32 AreaOffset() const;
void SetOverlay(::Overlay* cookie);
::Overlay* Overlay() const;
::Overlay* Overlay() const;
//! Does a shallow copy of the bitmap passed to it
inline void ShallowCopy(const ServerBitmap *from);

14
src/servers/app/ServerWindow.cpp
View File

@ -1514,13 +1514,23 @@ ServerWindow::_DispatchViewMessage(int32 code,
if (status == B_OK) {
ServerBitmap* bitmap = fServerApp->FindBitmap(bitmapToken);
if (bitmapToken == -1 || bitmap != NULL) {
bool wasOverlay = fCurrentLayer->ViewBitmap() != NULL
&& fCurrentLayer->ViewBitmap()->Overlay() != NULL;
// TODO: this is a race condition: the bitmap could have been
// deleted in the mean time!!
fCurrentLayer->SetViewBitmap(bitmap, srcRect, dstRect,
resizingMode, options);
BRegion dirty(fCurrentLayer->Bounds());
fWindowLayer->InvalidateView(fCurrentLayer, dirty);
// TODO: if we revert the view color overlay handling
// in ViewLayer::Draw() to the R5 version, we never
// need to invalidate the view for overlays.
// invalidate view - but only if this is a non-overlay switch
if (bitmap == NULL || bitmap->Overlay() == NULL || !wasOverlay) {
BRegion dirty(fCurrentLayer->Bounds());
fWindowLayer->InvalidateView(fCurrentLayer, dirty);
}
if (bitmap != NULL && bitmap->Overlay() != NULL)
colorKey = bitmap->Overlay()->Color().GetColor32();

3
src/servers/app/ViewLayer.h
View File

@ -141,6 +141,9 @@ class ViewLayer {
{ return fViewColor; }
void SetViewColor(const RGBColor& color)
{ fViewColor = color; }
ServerBitmap* ViewBitmap() const
{ return fViewBitmap; }
void SetViewBitmap(ServerBitmap* bitmap, BRect sourceRect,
BRect destRect, int32 resizingMode, int32 options);