From ef79db4f7c1b9ae50dd8ea55be09bd9381990de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 29 Jun 2005 00:22:01 +0000 Subject: [PATCH] Doh, two times in a row... forgot to update ViewAux.h. Changes from BView refactoring. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13339 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/interface/ViewAux.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/headers/private/interface/ViewAux.h b/headers/private/interface/ViewAux.h index d84e8df6c5..24d9e674c3 100644 --- a/headers/private/interface/ViewAux.h +++ b/headers/private/interface/ViewAux.h @@ -30,7 +30,7 @@ enum { B_VIEW_BLENDING_BIT = 0x00000020, B_VIEW_SCALE_BIT = 0x00000040, B_VIEW_FONT_ALIASING_BIT = 0x00000080, - B_VIEW_COORD_BIT = 0x00000100, + B_VIEW_FRAME_BIT = 0x00000100, B_VIEW_ORIGIN_BIT = 0x00000200, B_VIEW_PEN_SIZE_BIT = 0x00000400, B_VIEW_PEN_LOCATION_BIT = 0x00000800, @@ -38,6 +38,8 @@ enum { B_VIEW_VIEW_COLOR_BIT = 0x00010000, B_VIEW_PATTERN_BIT = 0x00020000, + B_VIEW_ALL_BITS = 0x0003ffff, + // these used for archiving only B_VIEW_RESIZE_BIT = 0x00001000, B_VIEW_FLAGS_BIT = 0x00002000, @@ -51,11 +53,14 @@ class ViewState { public: ViewState(); - bool IsValid(uint32 bit) { return valid_flags & bit; } + inline bool IsValid(uint32 bit) const; + inline bool IsAllValid() const; void UpdateServerFontState(BPrivate::PortLink &link); void UpdateServerState(BPrivate::PortLink &link); + void UpdateFrom(BPrivate::PortLink &link); + public: BPoint pen_location; float pen_size; @@ -95,6 +100,19 @@ class ViewState { uint32 archiving_flags; }; +inline bool +ViewState::IsValid(uint32 bit) const +{ + return valid_flags & bit; +} + +inline bool +ViewState::IsAllValid() const +{ + return (valid_flags & B_VIEW_ALL_BITS & ~B_VIEW_CLIP_REGION_BIT) + == (B_VIEW_ALL_BITS & ~B_VIEW_CLIP_REGION_BIT); +} + } // namespace BPrivate struct _array_hdr_{