author | sandman <sandman> | 2002-07-08 00:42:56 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-07-08 00:42:56 (UTC) |
commit | 923a6290c8cc93914d54e583f1d79a6bae638fab (patch) (unidiff) | |
tree | b2562e4dbf6d71631b358021f8c4ec29f36a6d12 /noncore/styles/liquid | |
parent | 895f43bd1850b3e0c43edaaad18a7d7f2613033b (diff) | |
download | opie-923a6290c8cc93914d54e583f1d79a6bae638fab.zip opie-923a6290c8cc93914d54e583f1d79a6bae638fab.tar.gz opie-923a6290c8cc93914d54e583f1d79a6bae638fab.tar.bz2 |
- Fix a memory leak (bg pixmaps for taskbar applets were never freed)
- Try to be more intelligent about stipple alignment in child widgets
(in every app I tested the stipple is now always aligned right)
-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 8 | ||||
-rw-r--r-- | noncore/styles/liquid/plugin.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index 67e53e9..fc925b8 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp | |||
@@ -127,5 +127,5 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev) | |||
127 | 127 | ||
128 | if (p->inherits("QPopupMenu")) | ||
129 | pixDict.insert(p->winId(), pix); | 128 | pixDict.insert(p->winId(), pix); |
130 | else { | 129 | |
130 | if (!p->inherits("QPopupMenu")) { | ||
131 | p->setBackgroundPixmap(*pix); | 131 | p->setBackgroundPixmap(*pix); |
@@ -148,5 +148,4 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev) | |||
148 | 148 | ||
149 | if (p->inherits("QPopupMenu")) | ||
150 | pixDict.remove(p->winId()); | 149 | pixDict.remove(p->winId()); |
151 | else { | 150 | if (!p->inherits("QPopupMenu")) { |
152 | p->setBackgroundMode(QWidget::PaletteBackground); | 151 | p->setBackgroundMode(QWidget::PaletteBackground); |
@@ -847,2 +846,3 @@ void LiquidStyle::polish(QWidget *w) | |||
847 | 846 | ||
847 | if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame )) | ||
848 | w-> setBackgroundOrigin ( QWidget::ParentOrigin ); | 848 | w-> setBackgroundOrigin ( QWidget::ParentOrigin ); |
diff --git a/noncore/styles/liquid/plugin.cpp b/noncore/styles/liquid/plugin.cpp index f149c29..5f4c8e5 100644 --- a/noncore/styles/liquid/plugin.cpp +++ b/noncore/styles/liquid/plugin.cpp | |||
@@ -111 +111,3 @@ QRESULT LiquidSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInt | |||
111 | 111 | ||
112 | // Hack for Retail Z experiments | ||
113 | extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } } | ||