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

* small cleanups for more coding style consistency

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23159 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2007-12-26 14:12:12 +00:00
parent 1d4722b73a
commit a4d578c4cb
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/servers/app/ViewLayer.cpp
View File

@ -1142,16 +1142,17 @@ ViewLayer::SetEventMask(uint32 eventMask, uint32 options)
void void
ViewLayer::SetCursor(ServerCursor *cursor) ViewLayer::SetCursor(ServerCursor *cursor)
{ {
if (cursor != fCursor) { if (cursor == fCursor)
if (fCursor) return;
fCursor->Release();
fCursor = cursor; if (fCursor)
fCursor->Release();
if (fCursor) { fCursor = cursor;
fCursor->Acquire();
fCursor->SetPendingViewCursor(false); if (fCursor) {
} fCursor->Acquire();
fCursor->SetPendingViewCursor(false);
} }
} }
@ -1163,13 +1164,6 @@ ViewLayer::SetPicture(ServerPicture *picture)
} }
ServerPicture *
ViewLayer::Picture() const
{
return fPicture;
}
void void
ViewLayer::Draw(DrawingEngine* drawingEngine, BRegion* effectiveClipping, ViewLayer::Draw(DrawingEngine* drawingEngine, BRegion* effectiveClipping,
BRegion* windowContentClipping, bool deep) BRegion* windowContentClipping, bool deep)

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

@ -37,8 +37,8 @@ class ServerPicture;
class ViewLayer { class ViewLayer {
public: public:
ViewLayer(IntRect frame, IntPoint scrollingOffset, ViewLayer(IntRect frame, IntPoint scrollingOffset,
const char* name, int32 token, uint32 resizeMode, const char* name, int32 token,
uint32 flags); uint32 resizeMode, uint32 flags);
virtual ~ViewLayer(); virtual ~ViewLayer();
@ -164,8 +164,9 @@ class ViewLayer {
ServerBitmap* ViewBitmap() const ServerBitmap* ViewBitmap() const
{ return fViewBitmap; } { return fViewBitmap; }
void SetViewBitmap(ServerBitmap* bitmap, IntRect sourceRect, void SetViewBitmap(ServerBitmap* bitmap,
IntRect destRect, int32 resizingMode, int32 options); IntRect sourceRect, IntRect destRect,
int32 resizingMode, int32 options);
void PushState(); void PushState();
void PopState(); void PopState();
@ -177,11 +178,12 @@ class ViewLayer {
uint32 EventOptions() const uint32 EventOptions() const
{ return fEventOptions; } { return fEventOptions; }
ServerCursor* Cursor() const { return fCursor; }
void SetCursor(ServerCursor* cursor); void SetCursor(ServerCursor* cursor);
ServerCursor* Cursor() const { return fCursor; }
ServerPicture* Picture() const;
void SetPicture(ServerPicture* picture); void SetPicture(ServerPicture* picture);
ServerPicture* Picture() const
{ return fPicture; }
// for background clearing // for background clearing
virtual void Draw(DrawingEngine* drawingEngine, virtual void Draw(DrawingEngine* drawingEngine,
@ -223,7 +225,7 @@ class ViewLayer {
// clipping // clipping
void RebuildClipping(bool deep); void RebuildClipping(bool deep);
BRegion& ScreenClipping(BRegion* windowContentClipping, BRegion& ScreenClipping(BRegion* windowContentClipping,
bool force = false) const; bool force = false) const;
void InvalidateScreenClipping(); void InvalidateScreenClipping();
inline bool IsScreenClippingValid() const inline bool IsScreenClippingValid() const
{ return fScreenClippingValid; } { return fScreenClippingValid; }
@ -233,7 +235,7 @@ class ViewLayer {
protected: protected:
void _MoveScreenClipping(int32 x, int32 y, void _MoveScreenClipping(int32 x, int32 y,
bool deep); bool deep);
Overlay* _Overlay() const; Overlay* _Overlay() const;
void _UpdateOverlayView() const; void _UpdateOverlayView() const;