Ticket #5525: spaceLayoutItem.patch

headers/os/interface/SpaceLayoutItem.h

@@ -12 +12 @@
 public:
                                 BSpaceLayoutItem(BSize minSize, BSize maxSize,
                                     BSize preferredSize, BAlignment alignment);
+                                BSpaceLayoutItem(BMessage* archive);
     virtual                     ~BSpaceLayoutItem();
 
     static  BSpaceLayoutItem*   CreateGlue();
@@ -34 +35 @@
     virtual BRect               Frame();
     virtual void                SetFrame(BRect frame);
 
+    virtual status_t            Archive(BMessage* into, bool deep = true) const;
+    static  BArchivable*        Instantiate(BMessage* from);
+
 private:
             BRect               fFrame;
             BSize               fMinSize;

src/kits/interface/SpaceLayoutItem.cpp

@@ -1 +1 @@
 /*
+ * Copyright 2010, Haiku, Inc.
  * Copyright 2006, Ingo Weinhold <bonefish@cs.tu-berlin.de>.
  * All rights reserved. Distributed under the terms of the MIT License.
  */
 
+#include <new>
+
+#include <Message.h>
 #include <SpaceLayoutItem.h>
 
 
-// constructor
+namespace {
+    const char* kMinSizeField = "BSpaceLayoutItem:minsize";
+    const char* kMaxSizeField = "BSpaceLayoutItem:maxsize";
+    const char* kPreferredSizeField = "BSpaceLayoutItem:prefsize";
+    const char* kAlignmentField = "BSpaceLayoutItem:alignment";
+    const char* kFrameField = "BSpaceLayoutItem:frame";
+    const char* kVisibleField = "BSpaceLayoutItem:visible";
+}
+
+
 BSpaceLayoutItem::BSpaceLayoutItem(BSize minSize, BSize maxSize,
     BSize preferredSize, BAlignment alignment)
-    : fFrame(),
-      fMinSize(minSize),
-      fMaxSize(maxSize),
-      fPreferredSize(preferredSize),
-      fAlignment(alignment),
-      fVisible(true)
+    : 
+    fFrame(),
+    fMinSize(minSize),
+    fMaxSize(maxSize),
+    fPreferredSize(preferredSize),
+    fAlignment(alignment),
+    fVisible(true)
 {
 }
 
-// destructor
+
+BSpaceLayoutItem::BSpaceLayoutItem(BMessage* archive)
+    :
+    BLayoutItem(archive)
+{
+    archive->FindSize(kMinSizeField, &fMinSize);
+    archive->FindSize(kMaxSizeField, &fMaxSize);
+    archive->FindSize(kPreferredSizeField, &fPreferredSize);
+
+    archive->FindAlignment(kAlignmentField, &fAlignment);
+
+    archive->FindRect(kFrameField, &fFrame);
+    archive->FindBool(kVisibleField, &fVisible);
+}
+
+
 BSpaceLayoutItem::~BSpaceLayoutItem()
 {
 }
 
-// CreateGlue
+
 BSpaceLayoutItem*
 BSpaceLayoutItem::CreateGlue() {
     return new BSpaceLayoutItem(
@@ -33 +62 @@
         BAlignment(B_ALIGN_HORIZONTAL_CENTER, B_ALIGN_VERTICAL_CENTER));
 }
 
-// CreateHorizontalStrut
+
 BSpaceLayoutItem*
 BSpaceLayoutItem::CreateHorizontalStrut(float width) {
     return new BSpaceLayoutItem(
@@ -43 +72 @@
         BAlignment(B_ALIGN_HORIZONTAL_CENTER, B_ALIGN_VERTICAL_CENTER));
 }
 
-// CreateVerticalStrut
+
 BSpaceLayoutItem*
 BSpaceLayoutItem::CreateVerticalStrut(float height) {
     return new BSpaceLayoutItem(
@@ -53 +82 @@
         BAlignment(B_ALIGN_HORIZONTAL_CENTER, B_ALIGN_VERTICAL_CENTER));
 }
 
-// MinSize
+
 BSize
 BSpaceLayoutItem::MinSize()
 {
     return fMinSize;
 }
 
-// MaxSize
+
 BSize
 BSpaceLayoutItem::MaxSize()
 {
     return fMaxSize;
 }
 
-// PreferredSize
+
 BSize
 BSpaceLayoutItem::PreferredSize()
 {
     return fPreferredSize;
 }
 
-// Alignment
+
 BAlignment
 BSpaceLayoutItem::Alignment()
 {
     return fAlignment;
 }
 
-// SetExplicitMinSize
+
 void
 BSpaceLayoutItem::SetExplicitMinSize(BSize size)
 {
@@ -93 +122 @@
     InvalidateLayout();
 }
 
-// SetExplicitMaxSize
+
 void
 BSpaceLayoutItem::SetExplicitMaxSize(BSize size)
 {
@@ -105 +134 @@
     InvalidateLayout();
 }
 
-// SetExplicitPreferredSize
+
 void
 BSpaceLayoutItem::SetExplicitPreferredSize(BSize size)
 {
@@ -117 +146 @@
     InvalidateLayout();
 }
 
-// SetExplicitAlignment
+
 void
 BSpaceLayoutItem::SetExplicitAlignment(BAlignment alignment)
 {
@@ -129 +158 @@
     InvalidateLayout();
 }
 
-// IsVisible
+
 bool
 BSpaceLayoutItem::IsVisible()
 {
     return fVisible;
 }
 
-// SetVisible
+
 void
 BSpaceLayoutItem::SetVisible(bool visible)
 {
     fVisible = visible;
 }
 
-// Frame
+
 BRect
 BSpaceLayoutItem::Frame()
 {
     return fFrame;
 }
 
-// SetFrame
+
 void
-BSpaceLayoutItem::SetFrame(BRect frame)
-{
+BSpaceLayoutItem::SetFrame(BRect frame) {
     fFrame = frame;
 }
+
+
+status_t
+BSpaceLayoutItem::Archive(BMessage* into, bool deep) const
+{
+    status_t err = BLayoutItem::Archive(into, deep);
+
+    if (err == B_OK)
+        err = into->AddRect(kFrameField, fFrame);
+
+    if (err == B_OK)
+        err = into->AddSize(kMinSizeField, fMinSize);
+
+    if (err == B_OK)
+        err = into->AddSize(kMaxSizeField, fMaxSize);
+
+    if (err == B_OK)
+        err = into->AddSize(kPreferredSizeField, fPreferredSize);
+
+    if (err == B_OK)
+        err = into->AddAlignment(kAlignmentField, fAlignment);
+
+    if (err == B_OK)
+        err =into->AddBool(kVisibleField, fVisible);
+
+    return err;
+}
+
+
+
+BArchivable*
+BSpaceLayoutItem::Instantiate(BMessage* from)
+{
+    if (validate_instantiation(from, "BSpaceLayoutItem"))
+        return new(std::nothrow) BSpaceLayoutItem(from);
+    return NULL;
+}
+