canvas::NasalWidget: check for empty setGeometry callback.

[simgear.git] / simgear / canvas / layout / NasalWidget.hxx

diff --git a/simgear/canvas/layout/NasalWidget.hxx b/simgear/canvas/layout/NasalWidget.hxx
index 1fc4446a1cdd1e961d6b11b41a70a49b453ef3f5..a55fa228723c29b3f00b0c10c5e09762a39b273d 100644 (file)
--- a/simgear/canvas/layout/NasalWidget.hxx
+++ b/simgear/canvas/layout/NasalWidget.hxx
@@ -49,16 +49,41 @@ namespace canvas
        */
       NasalWidget(naRef impl);
 
+      ~NasalWidget();
+
+      virtual void invalidate();
       virtual void setGeometry(const SGRecti& geom);
+      virtual void onRemove();
 
       void setSetGeometryFunc(const SetGeometryFunc& func);
       void setHeightForWidthFunc(const HeightForWidthFunc& func);
       void setMinimumHeightForWidthFunc(const HeightForWidthFunc& func);
 
+      /** Set size hint.
+       *
+       * Overrides default size hint. Set to (0, 0) to fall back to default size
+       * hint.
+       */
       void setSizeHint(const SGVec2i& s);
+
+      /** Set minimum size.
+       *
+       * Overrides default minimum size. Set to (0, 0) to fall back to default
+       * minimum size.
+       */
       void setMinimumSize(const SGVec2i& s);
+
+      /** Set maximum size.
+       *
+       * Overrides default maximum size hint. Set to LayoutItem::MAX_SIZE to
+       * fall back to default maximum size.
+       */
       void setMaximumSize(const SGVec2i& s);
 
+      void setLayoutSizeHint(const SGVec2i& s);
+      void setLayoutMinimumSize(const SGVec2i& s);
+      void setLayoutMaximumSize(const SGVec2i& s);
+
       virtual bool hasHeightForWidth() const;
       virtual int heightForWidth(int w) const;
       virtual int minimumHeightForWidth(int w) const;
@@ -69,10 +94,23 @@ namespace canvas
       static void setupGhost(nasal::Hash& ns);
 
     protected:
+      enum WidgetFlags
+      {
+        LAYOUT_DIRTY = LayoutItem::LAST_FLAG << 1,
+        LAST_FLAG = LAYOUT_DIRTY
+      };
+
       SetGeometryFunc       _set_geometry;
       HeightForWidthFunc    _height_for_width,
                             _min_height_for_width;
 
+      SGVec2i _layout_size_hint,
+              _layout_min_size,
+              _layout_max_size,
+              _user_size_hint,
+              _user_min_size,
+              _user_max_size;
+
       int callHeightForWidthFunc( const HeightForWidthFunc& hfw,
                                   int w ) const;