projects
/
dorian
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix forward navigation control on Linux.
[dorian]
/
fullscreenwindow.cpp
diff --git
a/fullscreenwindow.cpp
b/fullscreenwindow.cpp
index
c63f003
..
145b425
100644
(file)
--- a/
fullscreenwindow.cpp
+++ b/
fullscreenwindow.cpp
@@
-12,12
+12,11
@@
static const int MARGIN = 9;
FullScreenWindow::FullScreenWindow(QWidget *parent): AdopterWindow(parent)
{
TRACE;
FullScreenWindow::FullScreenWindow(QWidget *parent): AdopterWindow(parent)
{
TRACE;
- Q_ASSERT(parent);
-#ifdef Q_WS_MAEMO_5
+
+#if defined(Q_WS_MAEMO_5)
setAttribute(Qt::WA_Maemo5StackedWindow, true);
setAttribute(Qt::WA_Maemo5NonComposited, true);
setAttribute(Qt::WA_Maemo5StackedWindow, true);
setAttribute(Qt::WA_Maemo5NonComposited, true);
-#endif // Q_WS_MAEMO_5
- hideToolBar();
+#endif
QFrame *frame = new QFrame(this);
QVBoxLayout *layout = new QVBoxLayout(frame);
layout->setMargin(0);
QFrame *frame = new QFrame(this);
QVBoxLayout *layout = new QVBoxLayout(frame);
layout->setMargin(0);
@@
-36,15
+35,23
@@
FullScreenWindow::FullScreenWindow(QWidget *parent): AdopterWindow(parent)
void FullScreenWindow::showEvent(QShowEvent *e)
{
Trace t("FullScreenWindow::showEvent");
void FullScreenWindow::showEvent(QShowEvent *e)
{
Trace t("FullScreenWindow::showEvent");
- AdopterWindow::showEvent(e);
+ qDebug() << "Softkeys visible?"
+ << (windowFlags() & Qt::WindowSoftkeysVisibleHint);
placeChildren();
placeChildren();
+ AdopterWindow::showEvent(e);
}
void FullScreenWindow::resizeEvent(QResizeEvent *e)
{
Trace t("FullScreenWindow::resizeEvent");
}
void FullScreenWindow::resizeEvent(QResizeEvent *e)
{
Trace t("FullScreenWindow::resizeEvent");
- AdopterWindow::resizeEvent(e);
placeChildren();
placeChildren();
+ AdopterWindow::resizeEvent(e);
+}
+
+void FullScreenWindow::closeEvent(QCloseEvent *e)
+{
+ Trace t("FullscreenWindow::closeEvent");
+ AdopterWindow::closeEvent(e);
}
void FullScreenWindow::placeChildren()
}
void FullScreenWindow::placeChildren()