1 files changed, 15 insertions, 40 deletions

diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index fb47c14..1afae88 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -244,168 +244,143 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e )
                 QPoint p = ((QMouseEvent*)e)->globalPos();
                 if ( pointInQpeRegion( w, p ) == QPEDecoration::Help ) {
                     helpState = QWSButton::Clicked|QWSButton::MouseOver;
                 } else {
                     helpState = 0;
                 }
                 if ( helpState != oldState )
                     drawButton( w, QPEDecoration::Help, helpState );
             }
             break;
         default:
             break;
     }
     return QObject::eventFilter( o, e );
 }
 
 void QPEManager::drawButton( QWidget *w, QPEDecoration::QPERegion r, int state )
 {
     QPainter painter(w);
     QRegion rgn = ((TLWidget *)w)->topExtra()->decor_allocated_region;
     painter.internalGfx()->setWidgetDeviceRegion( rgn );
     painter.setClipRegion(decoration->region(w, w->rect(),QWSDecoration::All));
     decoration->paintButton( &painter, w, (QWSDecoration::Region)r, state );
 }
 
 void QPEManager::drawTitle( QWidget *w )
 {
     QPainter painter(w);
     QRegion rgn = ((TLWidget *)w)->topExtra()->decor_allocated_region;
     painter.internalGfx()->setWidgetDeviceRegion( rgn );
     painter.setClipRegion(decoration->region(w, w->rect(),QWSDecoration::All));
     decoration->paint( &painter, w );
     decoration->paintButton(&painter, w, QWSDecoration::Menu, 0);
     decoration->paintButton(&painter, w, QWSDecoration::Close, 0);
     decoration->paintButton(&painter, w, QWSDecoration::Minimize, 0);
     decoration->paintButton(&painter, w, QWSDecoration::Maximize, 0);
 }
 
 void QPEManager::whatsThisTimeout()
 {
     if ( !QWhatsThis::inWhatsThisMode() ) {
         if ( inWhatsThis ) {
             if ( whatsThis ) {
                 QWidget *w = whatsThis;
                 whatsThis = 0;
                 drawTitle( w );
             }
             wtTimer->stop();
         } else {
             QWhatsThis::enterWhatsThisMode();
             helpState = 0;
             updateActive();
             if ( active ) {
                 whatsThis = active;
                 drawTitle( active );
                 // check periodically to see if we've left whats this mode
                 wtTimer->start( 250 );
             }
         }
         inWhatsThis = !inWhatsThis;
     }
 }
 
 //===========================================================================
-
-static QImage *okImage( int th )
-{
-    static QImage *i = 0;
-    if ( !i || ::abs( i->height()-th ) > 4 ) {
-        delete i;
-        i = new QImage(scaleButton(Resource::loadImage("OKButton"),th));
-    }
-    return i;
-}
-
-static QImage *closeImage( int th )
-{
-    static QImage *i = 0;
-    if ( !i || ::abs( i->height()-th ) > 4 ) {
-        delete i;
-        i = new QImage(scaleButton(Resource::loadImage("CloseButton"),th));
-    }
-    return i;
-}
-
-static QImage *helpImage( int th )
-{
-    static QImage *i = 0;
-    if ( !i || ::abs( i->height()-th ) > 4 ) {
-        delete i;
-        i = new QImage(scaleButton(Resource::loadImage("HelpButton"),th));
-    }
-    return i;
-}
-
-static QImage *maximizeImage( int th )
-{
-    static QImage *i = 0;
-    if ( !i || ::abs( i->height()-th ) > 4 ) {
-        delete i;
-        i = new QImage(scaleButton(Resource::loadImage("MaximizeButton"),th));
-    }
-    return i;
-}
+#define IMAGE_METHOD( methodName, imageName )                             \
+static QImage* methodName( int th ) {                                     \
+    static QImage *i = 0;                                                 \
+     if ( !i || ::abs( i->height()-th ) > 4 ) {                           \
+         delete i;                                                        \
+         i = new QImage(scaleButton(Resource::loadImage(#imageName),th)); \
+     }                                                                    \
+                                                                          \
+     return i;                                                            \
+}
+
+IMAGE_METHOD(okImage,      OKButton       );
+IMAGE_METHOD(closeImage,   CloseButton    );
+IMAGE_METHOD(helpImage,    HelpButton     );
+IMAGE_METHOD(maximizeImage,MaximizeButton );
 
 int WindowDecorationInterface::metric( Metric m, const WindowData *wd ) const
 {
     switch ( m ) {
         case TitleHeight:
             if ( QApplication::desktop()->height() > 320 )
                 return 19;
             else
                 return 15;
         case LeftBorder:
         case RightBorder:
         case TopBorder:
         case BottomBorder:
             return 4;
         case OKWidth:
             return okImage(metric(TitleHeight,wd))->width();
         case CloseWidth:
             return closeImage(metric(TitleHeight,wd))->width();
         case HelpWidth:
             return helpImage(metric(TitleHeight,wd))->width();
         case MaximizeWidth:
             return maximizeImage(metric(TitleHeight,wd))->width();
         case CornerGrabSize:
             return 16;
     }
 
     return 0;
 }
 
 void WindowDecorationInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const
 {
     int th = metric( TitleHeight, wd );
     QRect r = wd->rect;
 
     switch ( a ) {
         case Border:
             {
                 const QColorGroup &cg = wd->palette.active();
                 qDrawWinPanel(p, r.x()-metric(LeftBorder,wd),
                         r.y()-th-metric(TopBorder,wd),
                         r.width()+metric(LeftBorder,wd)+metric(RightBorder,wd),
                         r.height()+th+metric(TopBorder,wd)+metric(BottomBorder,wd),
                         cg, FALSE, &cg.brush(QColorGroup::Background));
             }
             break;
         case Title:
             {
                 const QColorGroup &cg = wd->palette.active();
                 QBrush titleBrush;
                 QPen   titleLines;
 
                 if ( wd->flags & WindowData::Active ) {
                     titleBrush = cg.brush(QColorGroup::Highlight);
                     titleLines = titleBrush.color().dark();
                 } else {
                     titleBrush = cg.brush(QColorGroup::Background);
                     titleLines = titleBrush.color();
                 }
 
                 p->fillRect( r.x(), r.y()-th, r.width(), th, titleBrush);
 
                 p->setPen( titleLines );
                 for ( int i = r.y()-th; i < r.y(); i += 2 )
                     p->drawLine( r.left(), i, r.right(), i );