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

Renamed BView::_SetViewImage() to _SetViewBitmap(), and AS_LAYER_SET_VIEW_IMAGE

Browse Source 
to AS_LAYER_SET_VIEW_BITMAP.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15716 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-12-29 14:52:43 +00:00
parent 9f8f6275f6
commit e351ecb78d
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/View.h
+1 -1
View File
@@ -528,7 +528,7 @@ private:
void _InitData(BRect frame, const char* name, uint32 resizeMask, void _InitData(BRect frame, const char* name, uint32 resizeMask,
uint32 flags); uint32 flags);
status_t _SetViewImage(const BBitmap* bitmap,BRect srcRect, status_t _SetViewBitmap(const BBitmap* bitmap,BRect srcRect,
BRect dstRect, uint32 followFlags, uint32 options); BRect dstRect, uint32 followFlags, uint32 options);
void DoBezier(int32 gr, BPoint* controlPoints, pattern p); void DoBezier(int32 gr, BPoint* controlPoints, pattern p);
void DoShape(int32 gr, BShape* shape, pattern p); void DoShape(int32 gr, BShape* shape, pattern p);
headers/private/app/ServerProtocol.h
+1 -2
View File
@@ -6,7 +6,6 @@
* DarkWyrm <[email protected]> * DarkWyrm <[email protected]>
* Jérôme Duval, [email protected] * Jérôme Duval, [email protected]
*/ */
#ifndef _APP_SERVER_PROTOCOL_H_ #ifndef _APP_SERVER_PROTOCOL_H_
#define _APP_SERVER_PROTOCOL_H_ #define _APP_SERVER_PROTOCOL_H_
@@ -313,7 +312,7 @@ enum {
AS_LAYER_SET_STATE, AS_LAYER_SET_STATE,
AS_LAYER_SET_FONT_STATE, AS_LAYER_SET_FONT_STATE,
AS_LAYER_GET_STATE, AS_LAYER_GET_STATE,
AS_LAYER_SET_VIEW_IMAGE, AS_LAYER_SET_VIEW_BITMAP,
AS_LAYER_SET_PATTERN, AS_LAYER_SET_PATTERN,
AS_SET_CURRENT_LAYER, AS_SET_CURRENT_LAYER,
src/kits/interface/View.cpp
+8 -8
View File
@@ -3038,7 +3038,7 @@ void
BView::SetViewBitmap(const BBitmap *bitmap, BRect srcRect, BRect dstRect, BView::SetViewBitmap(const BBitmap *bitmap, BRect srcRect, BRect dstRect,
uint32 followFlags, uint32 options) uint32 followFlags, uint32 options)
{ {
_SetViewImage(bitmap, srcRect, dstRect, followFlags, options); _SetViewBitmap(bitmap, srcRect, dstRect, followFlags, options);
} }
@@ -3051,14 +3051,14 @@ BView::SetViewBitmap(const BBitmap *bitmap, uint32 followFlags, uint32 options)
rect.OffsetTo(0, 0); rect.OffsetTo(0, 0);
_SetViewImage(bitmap, rect, rect, followFlags, options); _SetViewBitmap(bitmap, rect, rect, followFlags, options);
} }
void void
BView::ClearViewBitmap() BView::ClearViewBitmap()
{ {
_SetViewImage(NULL, BRect(), BRect(), 0, 0); _SetViewBitmap(NULL, BRect(), BRect(), 0, 0);
} }
@@ -3066,7 +3066,7 @@ status_t
BView::SetViewOverlay(const BBitmap *overlay, BRect srcRect, BRect dstRect, BView::SetViewOverlay(const BBitmap *overlay, BRect srcRect, BRect dstRect,
rgb_color *colorKey, uint32 followFlags, uint32 options) rgb_color *colorKey, uint32 followFlags, uint32 options)
{ {
status_t err = _SetViewImage(overlay, srcRect, dstRect, followFlags, status_t err = _SetViewBitmap(overlay, srcRect, dstRect, followFlags,
options | 0x4); options | 0x4);
// TODO: Incomplete? // TODO: Incomplete?
@@ -3088,7 +3088,7 @@ BView::SetViewOverlay(const BBitmap *overlay, rgb_color *colorKey,
rect.OffsetTo(0, 0); rect.OffsetTo(0, 0);
status_t err = _SetViewImage(overlay, rect, rect, followFlags, status_t err = _SetViewBitmap(overlay, rect, rect, followFlags,
options | 0x4); options | 0x4);
// TODO: Incomplete? // TODO: Incomplete?
@@ -3103,7 +3103,7 @@ BView::SetViewOverlay(const BBitmap *overlay, rgb_color *colorKey,
void void
BView::ClearViewOverlay() BView::ClearViewOverlay()
{ {
_SetViewImage(NULL, BRect(), BRect(), 0, 0); _SetViewBitmap(NULL, BRect(), BRect(), 0, 0);
} }
@@ -4251,7 +4251,7 @@ BView::set_shelf(BShelf *shelf)
status_t status_t
BView::_SetViewImage(const BBitmap* bitmap, BRect srcRect, BView::_SetViewBitmap(const BBitmap* bitmap, BRect srcRect,
BRect dstRect, uint32 followFlags, uint32 options) BRect dstRect, uint32 followFlags, uint32 options)
{ {
if (!do_owner_check()) if (!do_owner_check())
@@ -4259,7 +4259,7 @@ BView::_SetViewImage(const BBitmap* bitmap, BRect srcRect,
int32 serverToken = bitmap ? bitmap->get_server_token() : -1; int32 serverToken = bitmap ? bitmap->get_server_token() : -1;
fOwner->fLink->StartMessage(AS_LAYER_SET_VIEW_IMAGE); fOwner->fLink->StartMessage(AS_LAYER_SET_VIEW_BITMAP);
fOwner->fLink->Attach<int32>(serverToken); fOwner->fLink->Attach<int32>(serverToken);
fOwner->fLink->Attach<BRect>(srcRect); fOwner->fLink->Attach<BRect>(srcRect);
fOwner->fLink->Attach<BRect>(dstRect); fOwner->fLink->Attach<BRect>(dstRect);