summaryrefslogtreecommitdiff
authordrw <drw>2005-04-14 18:29:44 (UTC)
committer drw <drw>2005-04-14 18:29:44 (UTC)
commit7a3b813cc3bfbb2f7c31f347c35405851e82aecf (patch) (side-by-side diff)
treeb9d384b6d33e396a0219386b4bf695b092bb606d
parent5f600ec21480d1d040203407a1d2446781702230 (diff)
downloadopie-7a3b813cc3bfbb2f7c31f347c35405851e82aecf.zip
opie-7a3b813cc3bfbb2f7c31f347c35405851e82aecf.tar.gz
opie-7a3b813cc3bfbb2f7c31f347c35405851e82aecf.tar.bz2
Fix icon sizing for light and qpe styles
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/lightstyle.cpp30
-rw-r--r--library/qpestyle.cpp8
2 files changed, 23 insertions, 15 deletions
diff --git a/library/lightstyle.cpp b/library/lightstyle.cpp
index 3bd1623..c5073ca 100644
--- a/library/lightstyle.cpp
+++ b/library/lightstyle.cpp
@@ -569,3 +569,3 @@ void LightStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected
p->setFont( f );
-#endif
+#endif
QRect r( t->rect() );
@@ -595,3 +595,3 @@ void LightStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected
//do shading; will not work for pixmap brushes
- QColor bg = tb->colorGroup().button();
+ QColor bg = tb->colorGroup().button();
// int h,s,v;
@@ -608,3 +608,3 @@ void LightStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected
}
-
+
}
@@ -688,3 +688,3 @@ void LightStyle::drawTab(QPainter *p, const QTabBar *tabbar, QTab *tab,
- p->setPen( NoPen );
+ p->setPen( NoPen );
p->setBrush(g.brush(selected ? QColorGroup::Background : QColorGroup::Mid));
@@ -884,5 +884,5 @@ void LightStyle::drawScrollBarControls( QPainter* p, const QScrollBar* scrollbar
-
+
int fudge = 3; //####disgusting hack
-
+
if (scrollbar->orientation() == Horizontal) {
@@ -970,9 +970,9 @@ void LightStyle::drawScrollBarControls( QPainter* p, const QScrollBar* scrollbar
g.brush( QColorGroup::Mid ));
- p->fillRect( sliderR.x() + sliderR.width() - 2,
+ p->fillRect( sliderR.x() + sliderR.width() - 2,
sliderR.y(), 2, 2,
g.brush( QColorGroup::Mid ));
- p->fillRect( sliderR.x() + sliderR.width() - 2,
+ p->fillRect( sliderR.x() + sliderR.width() - 2,
sliderR.y() + sliderR.height() - 2, 2, 2,
g.brush( QColorGroup::Mid ));
- p->fillRect( sliderR.x(),
+ p->fillRect( sliderR.x(),
sliderR.y() + sliderR.height() - 2, 2, 2,
@@ -1120,3 +1120,3 @@ int LightStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QF
{
-#ifndef QT_NO_MENUDATA
+#ifndef QT_NO_MENUDATA
int h = 0;
@@ -1130,3 +1130,3 @@ int LightStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QF
if ( !mi->isSeparator() && mi->iconSet() != 0 ) {
- h = QMAX( h, mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height() + 2*motifItemFrame );
+ h = QMAX( h, mi->iconSet()->pixmap().height() + 2*motifItemFrame );
}
@@ -1142,3 +1142,3 @@ void LightStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
{
-#ifndef QT_NO_MENUDATA
+#ifndef QT_NO_MENUDATA
const QColorGroup & g = pal.active();
@@ -1184,3 +1184,7 @@ void LightStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
mode = QIconSet::Active;
- QPixmap pixmap = mi->iconSet()->pixmap( QIconSet::Small, mode );
+ QPixmap pixmap;
+ if ( mode == QIconSet::Disabled )
+ pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+ else
+ pixmap = mi->iconSet()->pixmap();
int pixw = pixmap.width();
diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index 0566f6b..9503e02 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -1037,3 +1037,3 @@ int QPEStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFon
if ( !mi->isSeparator() && mi->iconSet() != 0 ) {
- h = QMAX( h, mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height() + 2*motifItemFrame );
+ h = QMAX( h, mi->iconSet()->pixmap().height() + 2*motifItemFrame );
}
@@ -1091,3 +1091,7 @@ void QPEStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int t
mode = QIconSet::Active;
- QPixmap pixmap = mi->iconSet()->pixmap( QIconSet::Small, mode );
+ QPixmap pixmap;
+ if ( mode == QIconSet::Disabled )
+ pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+ else
+ pixmap = mi->iconSet()->pixmap();
int pixw = pixmap.width();