diff options
| author | Bernd Lamecker <blam@sepp.nbg.basyskom.de> | 2010-06-08 15:44:57 +0200 |
|---|---|---|
| committer | Bernd Lamecker <blam@sepp.nbg.basyskom.de> | 2010-06-16 11:06:02 +0200 |
| commit | 35f98f0de626f6e903a913a3b839aba4b3363453 (patch) | |
| tree | 4263a7f28767d1224f0d7c428f8d8e9c1d7de468 /plainqt | |
| parent | b3dce863bf0781274337fbee2ca39fe71d8d7ed7 (diff) | |
Changes: Improved drawing of window background
RevBy: TrustMe
Diffstat (limited to 'plainqt')
| -rw-r--r-- | plainqt/style/qtmaemo6styleeventfilter.cpp | 3 | ||||
| -rw-r--r-- | plainqt/style/qtmaemo6windowdecoration.cpp | 6 | ||||
| -rw-r--r-- | plainqt/style/qtmaemo6windowdecoration.h | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/plainqt/style/qtmaemo6styleeventfilter.cpp b/plainqt/style/qtmaemo6styleeventfilter.cpp index 44de1672..ef1eb106 100644 --- a/plainqt/style/qtmaemo6styleeventfilter.cpp +++ b/plainqt/style/qtmaemo6styleeventfilter.cpp @@ -67,7 +67,6 @@ bool QtMaemo6StyleEventFilter::eventFilter(QObject *obj, QEvent *event) QtMaemo6DialogProxy *dialogProxy = new QtMaemo6DialogProxy(dialog, m_style->m_windowDecoration); dialogProxy->setTitle(widget->windowTitle()); dialogProxy->showFastMaximized(); - QtMaemo6StylePrivate::drawWindowBackground(widget); return true; } else if(QMenu* menu = qobject_cast<QMenu*>(widget)) { //also show menus styled like m menus, even if they are not called from a menubar @@ -80,7 +79,6 @@ bool QtMaemo6StyleEventFilter::eventFilter(QObject *obj, QEvent *event) decoration->setMenuBar(NULL); bool navigationBarVisible = !qApp->dynamicPropertyNames().contains(M::NoMNavigationBar); decoration->showNavigationBar( navigationBarVisible ); - QtMaemo6StylePrivate::drawWindowBackground(decoration); } else if (!qobject_cast<QtMaemo6Window *>(widget) && !widget->inherits("QTipLabel") && //don't create a new window for every tooltip! !qobject_cast<MWindow*>(widget)) { @@ -92,7 +90,6 @@ bool QtMaemo6StyleEventFilter::eventFilter(QObject *obj, QEvent *event) m_style->m_windowDecoration->showNavigationBar( navigationBarVisible ); bool statusBarVisible = !qApp->dynamicPropertyNames().contains(M::NoMStatusBar); m_style->m_windowDecoration->showDeviceStatusBar( statusBarVisible ); - QtMaemo6StylePrivate::drawWindowBackground(m_style->m_windowDecoration); return true; } } diff --git a/plainqt/style/qtmaemo6windowdecoration.cpp b/plainqt/style/qtmaemo6windowdecoration.cpp index e15a50e3..3b5643e4 100644 --- a/plainqt/style/qtmaemo6windowdecoration.cpp +++ b/plainqt/style/qtmaemo6windowdecoration.cpp @@ -21,6 +21,7 @@ #include "qtmaemo6windowdecoration.h" #include "qtmaemo6titlebar.h" #include "qtmaemo6menuproxy.h" +#include "qtmaemo6style_p.h" #include <QLabel> #include <QVBoxLayout> @@ -218,6 +219,11 @@ bool QtMaemo6WindowDecoration::eventFilter(QObject *watched, QEvent *event) return QtMaemo6Window::eventFilter(watched, event); } +void QtMaemo6WindowDecoration::resizeEvent(QResizeEvent * e) { + QtMaemo6StylePrivate::drawWindowBackground(this); + QWidget::resizeEvent(e); +} + void QtMaemo6WindowDecoration::timerEvent(QTimerEvent *e) { if(e->timerId() == m_deviceStatusBarTimerId) updateStatusBarSharedPixmap(orientation()); diff --git a/plainqt/style/qtmaemo6windowdecoration.h b/plainqt/style/qtmaemo6windowdecoration.h index 757459b1..aec4f340 100644 --- a/plainqt/style/qtmaemo6windowdecoration.h +++ b/plainqt/style/qtmaemo6windowdecoration.h @@ -70,6 +70,7 @@ protected: /*! \reimp */ bool eventFilter(QObject *obj, QEvent *event); + void resizeEvent(QResizeEvent *); void timerEvent(QTimerEvent *); /*! \reimp_end */ |