Ticket #5465: adds_onwhenpushed_to_pushbuttons.diff

libmyth/xmlparse.cpp

@@ -2922 +2922 @@
     QPixmap *image_on = NULL;
     QPixmap *image_off = NULL;
     QPixmap *image_pushed = NULL;
+    QPixmap *image_pushedon = NULL;
 
     QString name = element.attribute("name", "");
     if (name.isNull() || name.isEmpty())
@@ -2996 +2997 @@
                         cerr << "xmparse.o: I can't find a file called " << (const char *)file << endl ;
                     }
                 }
+                if (imgname.lower() == "pushedon")
+                {
+                    image_pushedon = gContext->LoadScalePixmap(file);
+                    if (!image_pushedon)
+                    {
+                        cerr << "xmparse.o: I can't find a file called " << (const char *)file << endl ;
+                    }
+                }
             }
             else
             {
@@ -3011 +3020 @@
         image_off = new QPixmap();
     if (!image_pushed)
         image_pushed = new QPixmap();
+    if (!image_pushedon)
+        image_pushedon = new QPixmap();
 
     UIPushButtonType *pbt = new UIPushButtonType(name, *image_on, *image_off,
-                                                 *image_pushed);
+                                                 *image_pushed,
+                                                 *image_pushedon);
 
     delete image_on;
     delete image_off;
     delete image_pushed;
+    delete image_pushedon;
 
     pbt->SetScreen(wmult, hmult);
     pbt->setPosition(pos);

libmyth/uitypes.cpp

@@ -4830 +4830 @@
 
 // ********************************************************************
 
-UIPushButtonType::UIPushButtonType(const QString &name, QPixmap on, QPixmap off, QPixmap pushed)
+UIPushButtonType::UIPushButtonType(const QString &name, QPixmap on, QPixmap off, QPixmap pushed, QPixmap pushedon)
                      : UIType(name)
 {
     on_pixmap = on;
     off_pixmap = off;
     pushed_pixmap = pushed;
+    pushedon_pixmap = pushedon;
     currently_pushed = false;
     takes_focus = true;
     m_lockOn = false;
@@ -4864 +4865 @@
 
     if (currently_pushed)
     {
-        p->drawPixmap(m_displaypos.x(), m_displaypos.y(), pushed_pixmap);
+        if (has_focus && !!pushedon_pixmap)
+        {
+            p->drawPixmap(m_displaypos.x(), m_displaypos.y(), pushedon_pixmap);
+        }
+        else
+        {
+            p->drawPixmap(m_displaypos.x(), m_displaypos.y(), pushed_pixmap);
+        }
     }
     else
     {
@@ -4931 +4939 @@
     {
         width = pushed_pixmap.width();
     }
+    if (pushedon_pixmap.width() > width)
+    {
+        width = pushedon_pixmap.width();
+    }
 
     height = off_pixmap.height();
     if (on_pixmap.height() > height)
@@ -4941 +4953 @@
     {
         height = pushed_pixmap.height();
     }
+    if (pushedon_pixmap.height() > height)
+    {
+        height = pushedon_pixmap.height();
+    }
 
     screen_area = QRect(x, y, width, height);
 }

libmyth/uitypes.h

@@ -1182 +1182 @@
 
   public:
 
-    UIPushButtonType(const QString &name, QPixmap on, QPixmap off, QPixmap pushed);
-
+    UIPushButtonType(const QString &name, QPixmap on, QPixmap off, QPixmap pushed, QPixmap pushedon=QPixmap());
+    
     virtual void Draw(QPainter *, int drawlayer, int context);
     void    setPosition(QPoint pos){m_displaypos = pos;}
     virtual void calculateScreenArea();
@@ -1206 +1206 @@
     QPixmap on_pixmap;
     QPixmap off_pixmap;
     QPixmap pushed_pixmap;
+    QPixmap pushedon_pixmap;
     bool    currently_pushed;
     QTimer  push_timer;
     bool    m_lockOn;