[browser] fixed menu skin to set the size automatically.

[vuplus_dvbapp] / lib / gui / ewidget.h

diff --git a/lib/gui/ewidget.h b/lib/gui/ewidget.h
index 22f5103..8af66b0 100644 (file)
--- a/lib/gui/ewidget.h
+++ b/lib/gui/ewidget.h
@@ -6,6 +6,8 @@
 #include <lib/gui/ewindowstyle.h> /* for eWindowStyle */
 #include <lib/gui/ewidgetanimation.h>
 
+#define MAX_LAYER 16
+
 class eWidgetDesktop;class eWidgetDesktop;
 
 class eWidget
@@ -13,12 +15,14 @@ class eWidget
        friend class eWidgetDesktop;
 public:
        eWidget(eWidget *parent);
-       
+       virtual ~eWidget();
+
        void move(ePoint pos);
        void resize(eSize size);
        
        ePoint position() const { return m_position; }
        eSize size() const { return m_size; }
+       eSize csize() const { return m_client_size; }
 
        void invalidate(const gRegion &region = gRegion::invalidRegion());
        
@@ -33,7 +37,7 @@ public:
        
        void destruct();
        
-       int getStyle(ePtr<eWindowStyle> &style) { if (!m_style) return 1; style = m_style; return 0; }
+       SWIG_VOID(int) getStyle(ePtr<eWindowStyle> &SWIG_NAMED_OUTPUT(style)) { if (!m_style) return 1; style = m_style; return 0; }
        void setStyle(eWindowStyle *style) { m_style = style; }
        
        void setBackgroundColor(const gRGB &col);
@@ -61,9 +65,11 @@ private:
        
        int m_vis;      
 
+       int m_layer;
+
        ePtrList<eWidget> m_childs;
        ePoint m_position;
-       eSize m_size;
+       eSize m_size, m_client_size;
                /* will be accounted when there's a client offset */
        eSize m_client_offset;
        eWidget *m_parent;
@@ -71,7 +77,7 @@ private:
        ePtr<eWindowStyle> m_style;
        
        void insertIntoParent();
-       void doPaint(gPainter &painter, const gRegion &region);
+       void doPaint(gPainter &painter, const gRegion &region, int layer);
        void recalcClipRegionsWhenVisible();
        
        void parentRemoved();
@@ -84,13 +90,12 @@ private:
        int m_z_position;
        int m_notify_child_on_position_change;
 protected:
-       virtual ~eWidget();
        void mayKillFocus();
 public:
 
                // all in local space!
        gRegion m_clip_region, m_visible_region, m_visible_with_childs;
-       struct eWidgetDesktopCompBuffer *m_comp_buffer;
+       struct eWidgetDesktopCompBuffer *m_comp_buffer[MAX_LAYER];
        
        enum eWidgetEvent
        {
@@ -101,8 +106,7 @@ public:
                
                evtParentChangedPosition,
                
-               evtWillShow,
-               evtWillHide,
+               evtParentVisibilityChanged,
                evtWillChangePosition, /* new size is eRect *data */
                evtWillChangeSize,
                
@@ -118,6 +122,8 @@ public:
 
                /* enable this if you need the absolute position of the widget */
        void setPositionNotifyChild(int n) { m_notify_child_on_position_change = 1; }
+
+       void notifyShowHide();
 };
 
 extern eWidgetDesktop *getDesktop(int which);