Add trash bin icon.

[dorian] / fullscreenwindow.cpp

diff --git a/fullscreenwindow.cpp b/fullscreenwindow.cpp
index 047c01a..c63f003 100644 (file)
--- a/fullscreenwindow.cpp
+++ b/fullscreenwindow.cpp
@@ -17,9 +17,7 @@ FullScreenWindow::FullScreenWindow(QWidget *parent): AdopterWindow(parent)
     setAttribute(Qt::WA_Maemo5StackedWindow, true);
     setAttribute(Qt::WA_Maemo5NonComposited, true);
 #endif // Q_WS_MAEMO_5
-#ifndef Q_OS_SYMBIAN
-    toolBar->hide();
-#endif
+    hideToolBar();
     QFrame *frame = new QFrame(this);
     QVBoxLayout *layout = new QVBoxLayout(frame);
     layout->setMargin(0);
@@ -35,18 +33,18 @@ FullScreenWindow::FullScreenWindow(QWidget *parent): AdopterWindow(parent)
     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");
+    AdopterWindow::showEvent(e);
     placeChildren();
 }
 
 void FullScreenWindow::resizeEvent(QResizeEvent *e)
 {
     Trace t("FullScreenWindow::resizeEvent");
-    QTimer::singleShot(100, this, SLOT(placeChildren()));
     AdopterWindow::resizeEvent(e);
+    placeChildren();
 }
 
 void FullScreenWindow::placeChildren()