git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/service/listboxservice.cpp: small fix
[enigma2.git]
/
lib
/
gui
/
ewindow.cpp
diff --git
a/lib/gui/ewindow.cpp
b/lib/gui/ewindow.cpp
index f8984729913c3cfc52365ac334e24240a74390bf..83e65ec3d21a0e05aad092c92cb1e45f3924ae6b 100644
(file)
--- a/
lib/gui/ewindow.cpp
+++ b/
lib/gui/ewindow.cpp
@@
-9,13
+9,14
@@
eWindow::eWindow(eWidgetDesktop *desktop, int z): eWidget(0)
{
m_flags = 0;
eWindow::eWindow(eWidgetDesktop *desktop, int z): eWidget(0)
{
m_flags = 0;
+ m_desktop = desktop;
/* ask style manager for current style */
ePtr<eWindowStyleManager> mgr;
eWindowStyleManager::getInstance(mgr);
ePtr<eWindowStyle> style;
if (mgr)
/* ask style manager for current style */
ePtr<eWindowStyleManager> mgr;
eWindowStyleManager::getInstance(mgr);
ePtr<eWindowStyle> style;
if (mgr)
- mgr->getStyle(style);
+ mgr->getStyle(
desktop->getStyleID(),
style);
/* when there is either no style manager or no style, revert to simple style. */
if (!style)
/* when there is either no style manager or no style, revert to simple style. */
if (!style)
@@
-34,7
+35,7
@@
eWindow::eWindow(eWidgetDesktop *desktop, int z): eWidget(0)
eWindow::~eWindow()
{
eWindow::~eWindow()
{
-
getDesktop()
->removeRootWidget(this);
+
m_desktop
->removeRootWidget(this);
m_child->destruct();
}
m_child->destruct();
}
@@
-51,6
+52,13
@@
std::string eWindow::getTitle() const
return m_title;
}
return m_title;
}
+void eWindow::setBackgroundColor(const gRGB &col)
+{
+ /* set background color for child, too */
+ eWidget::setBackgroundColor(col);
+ m_child->setBackgroundColor(col);
+}
+
void eWindow::setFlag(int flags)
{
m_flags |= flags;
void eWindow::setFlag(int flags)
{
m_flags |= flags;