Undo bad fix on Symbian.

[dorian] / widgets / mainbase.cpp

diff --git a/widgets/mainbase.cpp b/widgets/mainbase.cpp
index f2707c8..c9a4d54 100755 (executable)
--- a/widgets/mainbase.cpp
+++ b/widgets/mainbase.cpp
@@ -36,6 +36,8 @@ void MainBase::addToolBar()
 \r
 #if defined(Q_OS_SYMBIAN)\r
     toolBar = new QToolBar("", this);\r
+    toolBar->setFixedHeight(Platform::softKeyHeight());\r
+    toolBar->show();\r
     QMainWindow::addToolBar(Qt::BottomToolBarArea, toolBar);\r
 #else\r
     toolBar = QMainWindow::addToolBar("");\r
@@ -47,7 +49,8 @@ void MainBase::addToolBar()
     toolBar->toggleViewAction()->setVisible(false);\r
 \r
 #if defined(Q_WS_X11) && !defined(Q_WS_MAEMO_5)\r
-    toolBar->setIconSize(QSize(42, 42));\r
+    toolBar->setIconSize(QSize(Platform::toolBarIconHeight(),\r
+                               Platform::toolBarIconHeight()));\r
 #endif\r
 }\r
 \r
@@ -112,3 +115,20 @@ void MainBase::show()
     QMainWindow::show();\r
 #endif\r
 }\r
+\r
+#if 0 // ifdef Q_OS_SYMBIAN\r
+\r
+void MainBase::resizeEvent(QResizeEvent *e)\r
+{\r
+    Trace t("MainBase::resizeEvent");\r
+\r
+    QMainWindow::resizeEvent(e);\r
+    if (!toolBar) {\r
+        return;\r
+    }\r
+    QSize available = Platform::availableSize();\r
+    toolBar->setGeometry(0, available.height() - Platform::softKeyHeight(),\r
+                         available.width(), Platform::softKeyHeight());\r
+}\r
+\r
+#endif // Q_OS_SYMBIAN\r