diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2005-01-23 23:14:14 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2005-01-23 23:14:14 +0000 |
| commit | 4c9d04cb33fb06dfa075b431e36e7ea938a5f963 (patch) | |
| tree | c2c74af99bbece5f62c4577beca11f27c2539ec3 /lib/gui/ewidget.cpp | |
| parent | 9202d4248dd7df2f6e5eb53b4154c8297ec9b1d1 (diff) | |
| download | enigma2-4c9d04cb33fb06dfa075b431e36e7ea938a5f963.tar.gz enigma2-4c9d04cb33fb06dfa075b431e36e7ea938a5f963.zip | |
- allow close of dialog
- some eWidget fixes
- background for eWidgetDesktop
- introduce "session" object
Diffstat (limited to 'lib/gui/ewidget.cpp')
| -rw-r--r-- | lib/gui/ewidget.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp index 3ebac357..7f089361 100644 --- a/lib/gui/ewidget.cpp +++ b/lib/gui/ewidget.cpp @@ -10,7 +10,7 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0) if (m_parent) m_vis = wVisShow; - + if (m_parent) { m_parent->m_childs.push_back(this); @@ -109,7 +109,17 @@ void eWidget::show() void eWidget::hide() { + /* TODO: when hiding an upper level widget, widgets get hidden but keep the */ + /* wVisShow flag (because when the widget is shown again, the widgets must */ + /* become visible again. */ + if (!(m_vis & wVisShow)) + return; m_vis &= ~wVisShow; + + /* this is a workaround to the above problem. when we are in the delete phase, + don't hide childs. */ + if (!(m_parent || m_desktop)) + return; /* TODO: optimize here to only recalc what's required. possibly merge with show. */ eWidget *root = this; @@ -137,9 +147,13 @@ void eWidget::destruct() eWidget::~eWidget() { + hide(); + if (m_parent) m_parent->m_childs.remove(this); + m_parent = 0; + /* destroy all childs */ ePtrList<eWidget>::iterator i(m_childs.begin()); while (i != m_childs.end()) |