summaryrefslogtreecommitdiff
path: root/library
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 /library
parent5f600ec21480d1d040203407a1d2446781702230 (diff)
downloadopie-7a3b813cc3bfbb2f7c31f347c35405851e82aecf.zip
opie-7a3b813cc3bfbb2f7c31f347c35405851e82aecf.tar.gz
opie-7a3b813cc3bfbb2f7c31f347c35405851e82aecf.tar.bz2
Fix icon sizing for light and qpe styles
Diffstat (limited to 'library') (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
@@ -566,9 +566,9 @@ void LightStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected
// tab label with the default font.
QFont f = tb->font();
f.setBold( selected );
p->setFont( f );
-#endif
+#endif
QRect r( t->rect() );
if ( tb->shape() == QTabBar::RoundedAbove ) {
p->setPen( tb->colorGroup().light() );
p->drawLine( r.left(), r.bottom(), r.right(), r.bottom() );
@@ -592,9 +592,9 @@ void LightStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected
p->drawLine( r.left()+2, r.top()+1, r.right()-2, r.top()+1 );
p->fillRect( QRect( r.left()+1, r.top()+2, r.width()-2, r.height()-3),
tb->colorGroup().brush( QColorGroup::Button ));
//do shading; will not work for pixmap brushes
- QColor bg = tb->colorGroup().button();
+ QColor bg = tb->colorGroup().button();
// int h,s,v;
// bg.hsv( &h, &s, &v );
int n = r.height()/2;
int dark = 100;
@@ -605,9 +605,9 @@ void LightStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected
int x1 = r.left()+1;
int x2 = r.right()-1;
p->drawLine( x1, y, x2, y );
}
-
+
}
p->setPen( tb->colorGroup().light() );
p->drawLine( r.left(), r.bottom()-1, r.left(), r.top() + 2 );
@@ -685,9 +685,9 @@ void LightStyle::drawTab(QPainter *p, const QTabBar *tabbar, QTab *tab,
cliptri.setPoint(3, fr.left(), fr.top());
QRegion trir(cliptri);
p->setClipRegion(tabr - trir);
- p->setPen( NoPen );
+ p->setPen( NoPen );
p->setBrush(g.brush(selected ? QColorGroup::Background : QColorGroup::Mid));
fr.setWidth(fr.width() - 1);
p->drawRect(fr.left() + 1, fr.top() + 1, fr.width() - 2, fr.height() - 2);
@@ -881,11 +881,11 @@ void LightStyle::drawScrollBarControls( QPainter* p, const QScrollBar* scrollbar
scrollbar->width() : scrollbar->height());
int extent = ((scrollbar->orientation() == Horizontal) ?
scrollbar->height() : scrollbar->width());
-
+
int fudge = 3; //####disgusting hack
-
+
if (scrollbar->orientation() == Horizontal) {
subR.setRect(0, defaultFrameWidth(),
buttonDim + fudge, buttonDim);
subR2.setRect(length - (buttonDim * 2), defaultFrameWidth() ,
@@ -967,15 +967,15 @@ void LightStyle::drawScrollBarControls( QPainter* p, const QScrollBar* scrollbar
p->setBrushOrigin(sliderR.topLeft());
if ( sliderR.isValid() ) {
p->fillRect( sliderR.x(), sliderR.y(), 2, 2,
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,
g.brush( QColorGroup::Mid ));
QColorGroup cg( g );
@@ -1117,9 +1117,9 @@ int LightStyle::extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem*
/*! \reimp
*/
int LightStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFontMetrics& fm )
{
-#ifndef QT_NO_MENUDATA
+#ifndef QT_NO_MENUDATA
int h = 0;
if ( mi->isSeparator() ) // separator height
h = motifSepHeight;
else if ( mi->pixmap() ) // pixmap height
@@ -1127,9 +1127,9 @@ int LightStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QF
else // text height
h = fm.height() + 2*motifItemVMargin + 2*motifItemFrame;
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 );
}
if ( mi->custom() )
h = QMAX( h, mi->custom()->sizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1;
return h;
@@ -1139,9 +1139,9 @@ int LightStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QF
void LightStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi,
const QPalette& pal,
bool act, bool enabled, int x, int y, int w, int h)
{
-#ifndef QT_NO_MENUDATA
+#ifndef QT_NO_MENUDATA
const QColorGroup & g = pal.active();
bool dis = !enabled;
QColorGroup itemg = dis ? pal.disabled() : pal.active();
@@ -1181,9 +1181,13 @@ void LightStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
if ( mi->iconSet() ) { // draw iconset
QIconSet::Mode mode = dis ? QIconSet::Disabled : QIconSet::Normal;
if (act && !dis )
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();
int pixh = pixmap.height();
if ( act && !dis ) {
if ( !mi->isChecked() )
diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index 0566f6b..9503e02 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -1034,9 +1034,9 @@ int QPEStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFon
else // text height
h = fm.height() + 2*motifItemVMargin + 2*motifItemFrame - 1;
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 );
}
if ( mi->custom() )
h = QMAX( h, mi->custom()->sizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1;
return h;
@@ -1088,9 +1088,13 @@ void QPEStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int t
if ( mi->iconSet() ) { // draw iconset
QIconSet::Mode mode = dis ? QIconSet::Disabled : QIconSet::Normal;
if (act && !dis )
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();
int pixh = pixmap.height();
if ( act && !dis ) {
if ( !mi->isChecked() )