git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for previous commit
[enigma2.git]
/
lib
/
gui
/
ewidget.h
diff --git
a/lib/gui/ewidget.h
b/lib/gui/ewidget.h
index fbe5a92ae9c8683f1191b7170955bd14a5f9196b..7ddbbc5725f7279e473a83532e361186a10493c9 100644
(file)
--- a/
lib/gui/ewidget.h
+++ b/
lib/gui/ewidget.h
@@
-4,13
+4,19
@@
#include <lib/gdi/grc.h> /* for gRegion */
#include <lib/base/eptrlist.h> /* for eSmartPtrList */
#include <lib/gui/ewindowstyle.h> /* for eWindowStyle */
#include <lib/gdi/grc.h> /* for gRegion */
#include <lib/base/eptrlist.h> /* for eSmartPtrList */
#include <lib/gui/ewindowstyle.h> /* for eWindowStyle */
+#include <lib/gui/ewidgetanimation.h>
+
+#define MAX_LAYER 16
+
+class eWidgetDesktop;class eWidgetDesktop;
class eWidget
{
friend class eWidgetDesktop;
public:
eWidget(eWidget *parent);
class eWidget
{
friend class eWidgetDesktop;
public:
eWidget(eWidget *parent);
-
+ virtual ~eWidget();
+
void move(ePoint pos);
void resize(eSize size);
void move(ePoint pos);
void resize(eSize size);
@@
-30,13
+36,24
@@
public:
void destruct();
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 setStyle(eWindowStyle *style) { m_style = style; }
+ void setBackgroundColor(const gRGB &col);
+ void clearBackgroundColor();
+
+ void setZPosition(int z);
+ void setTransparent(int transp);
+
/* untested code */
int isVisible() { return (m_vis & wVisShow) && ((!m_parent) || m_parent->isVisible()); }
/* ... */
/* untested code */
int isVisible() { return (m_vis & wVisShow) && ((!m_parent) || m_parent->isVisible()); }
/* ... */
+
+ int isTransparent() { return m_vis & wVisTransparent; }
+ ePoint getAbsolutePosition();
+
+ eWidgetAnimation m_animation;
private:
eWidgetDesktop *m_desktop;
private:
eWidgetDesktop *m_desktop;
@@
-47,21
+64,37
@@
private:
int m_vis;
int m_vis;
+ int m_layer;
+
ePtrList<eWidget> m_childs;
ePoint m_position;
eSize m_size;
ePtrList<eWidget> m_childs;
ePoint m_position;
eSize m_size;
+ /* will be accounted when there's a client offset */
+ eSize m_client_offset;
eWidget *m_parent;
ePtr<eWindowStyle> m_style;
eWidget *m_parent;
ePtr<eWindowStyle> m_style;
- void doPaint(gPainter &painter, const gRegion ®ion);
+ void insertIntoParent();
+ void doPaint(gPainter &painter, const gRegion ®ion, int layer);
void recalcClipRegionsWhenVisible();
void recalcClipRegionsWhenVisible();
+
+ void parentRemoved();
+
+ gRGB m_background_color;
+ int m_have_background_color;
+
+ eWidget *m_current_focus, *m_focus_owner;
+
+ int m_z_position;
+ int m_notify_child_on_position_change;
protected:
protected:
- v
irtual ~eWidget
();
+ v
oid mayKillFocus
();
public:
// all in local space!
gRegion m_clip_region, m_visible_region, m_visible_with_childs;
public:
// all in local space!
gRegion m_clip_region, m_visible_region, m_visible_with_childs;
+ struct eWidgetDesktopCompBuffer *m_comp_buffer[MAX_LAYER];
enum eWidgetEvent
{
enum eWidgetEvent
{
@@
-70,18
+103,28
@@
public:
evtChangedPosition,
evtChangedSize,
evtChangedPosition,
evtChangedSize,
- evtWillShow,
- evtWillHide,
+ evtParentChangedPosition,
+
+ evtParentVisibilityChanged,
evtWillChangePosition, /* new size is eRect *data */
evtWillChangeSize,
evtAction,
evtWillChangePosition, /* new size is eRect *data */
evtWillChangeSize,
evtAction,
+ evtFocusGot,
+ evtFocusLost,
+
evtUserWidget,
};
virtual int event(int event, void *data = 0, void *data2 = 0);
evtUserWidget,
};
virtual int event(int event, void *data = 0, void *data2 = 0);
+ void setFocus(eWidget *focus);
+
+ /* 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();
+extern eWidgetDesktop *getDesktop(
int which
);
#endif
#endif