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 deprecated conversion from string constant to char* by using const char* instead...
[enigma2.git]
/
lib
/
gui
/
ewindow.cpp
diff --git
a/lib/gui/ewindow.cpp
b/lib/gui/ewindow.cpp
index 06827a9eede6cefff82df4cd64ef8911c7e33edd..83e65ec3d21a0e05aad092c92cb1e45f3924ae6b 100644
(file)
--- a/
lib/gui/ewindow.cpp
+++ b/
lib/gui/ewindow.cpp
@@
-6,33
+6,36
@@
#include <lib/gdi/epng.h>
#include <lib/gdi/epng.h>
-eWindow::eWindow(eWidgetDesktop *desktop): eWidget(0)
+eWindow::eWindow(eWidgetDesktop *desktop
, int z
): eWidget(0)
{
m_flags = 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)
style = new eWindowStyleSimple();
setStyle(style);
/* when there is either no style manager or no style, revert to simple style. */
if (!style)
style = new eWindowStyleSimple();
setStyle(style);
+
+ setZPosition(z); /* must be done before addRootWidget */
/* we are the parent for the child window. */
/* as we are in the constructor, this is thread safe. */
m_child = this;
m_child = new eWidget(this);
/* we are the parent for the child window. */
/* as we are in the constructor, this is thread safe. */
m_child = this;
m_child = new eWidget(this);
- desktop->addRootWidget(this
, 0
);
+ desktop->addRootWidget(this);
}
eWindow::~eWindow()
{
}
eWindow::~eWindow()
{
-
getDesktop()
->removeRootWidget(this);
+
m_desktop
->removeRootWidget(this);
m_child->destruct();
}
m_child->destruct();
}
@@
-49,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;