From: Akos Polster Date: Sun, 12 Jun 2011 14:48:18 +0000 (+0200) Subject: Symbian fixes. X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=0a0ae933b4a226c53a03e67886b0da44cc68ca50;hp=20bcc7d2b18201f309e4d2cc85d7690ae482ed25;p=dorian Symbian fixes. --- diff --git a/adopterwindow.cpp b/adopterwindow.cpp index 23bbf57..a1f369b 100644 --- a/adopterwindow.cpp +++ b/adopterwindow.cpp @@ -20,7 +20,7 @@ AdopterWindow::AdopterWindow(QWidget *parent): MainBase(parent), bookView(0), { TRACE; - // Monitor settings + // Monitor settings changes connect(Settings::instance(), SIGNAL(valueChanged(const QString &)), this, SLOT(onSettingsChanged(const QString &))); @@ -157,6 +157,7 @@ void AdopterWindow::closeEvent(QCloseEvent *event) if (bookView) { bookView->setLastBookmark(); } + hide(); MainBase::closeEvent(event); } diff --git a/fullscreenwindow.cpp b/fullscreenwindow.cpp index a80eed7..1ffbd7b 100644 --- a/fullscreenwindow.cpp +++ b/fullscreenwindow.cpp @@ -13,10 +13,10 @@ 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); -#endif // Q_WS_MAEMO_5 +#endif QFrame *frame = new QFrame(this); QVBoxLayout *layout = new QVBoxLayout(frame); layout->setMargin(0); diff --git a/widgets/dyalog.cpp b/widgets/dyalog.cpp index addef70..fc8d337 100644 --- a/widgets/dyalog.cpp +++ b/widgets/dyalog.cpp @@ -27,6 +27,10 @@ Dyalog::Dyalog(QWidget *parent, bool showButtons_): #endif scroller->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); scroller->setFrameStyle(QFrame::NoFrame); +#if defined(Q_OS_SYMBIAN) + setStyleSheet("QFrame {margin:0; border:0; padding:0}"); + setStyleSheet("QScrollArea {margin:0; border:0; padding:0}"); +#endif content = new QWidget(scroller); contentLayout = new QVBoxLayout(content);