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
047c01a
..
145b425
100644
(file)
--- a/
fullscreenwindow.cpp
+++ b/
fullscreenwindow.cpp
@@
-12,13
+12,10
@@
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
-#ifndef Q_OS_SYMBIAN
- toolBar->hide();
#endif
QFrame *frame = new QFrame(this);
QVBoxLayout *layout = new QVBoxLayout(frame);
#endif
QFrame *frame = new QFrame(this);
QVBoxLayout *layout = new QVBoxLayout(frame);
@@
-35,20
+32,28
@@
FullScreenWindow::FullScreenWindow(QWidget *parent): AdopterWindow(parent)
connect(restoreButton, SIGNAL(triggered()), this, SIGNAL(restore()));
}
connect(restoreButton, SIGNAL(triggered()), this, SIGNAL(restore()));
}
-void FullScreenWindow::showFullScreen()
+void FullScreenWindow::showEvent(QShowEvent *e)
{
{
- Trace t("FullScreenWindow::showFullScreen");
- AdopterWindow::showFullScreen();
+ Trace t("FullScreenWindow::showEvent");
+ 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");
- QTimer::singleShot(100, this, SLOT(placeChildren()));
+ placeChildren();
AdopterWindow::resizeEvent(e);
}
AdopterWindow::resizeEvent(e);
}
+void FullScreenWindow::closeEvent(QCloseEvent *e)
+{
+ Trace t("FullscreenWindow::closeEvent");
+ AdopterWindow::closeEvent(e);
+}
+
void FullScreenWindow::placeChildren()
{
Trace t("FullScreenWindow::placeChildren");
void FullScreenWindow::placeChildren()
{
Trace t("FullScreenWindow::placeChildren");