Changeset 165 for smplayer/trunk/src/skingui/panelseeker.cpp

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/skingui/panelseeker.cpp (modified) (7 diffs)

smplayer/trunk/src/skingui/panelseeker.cpp

@@ -1 @@
-/*  umplayer, GUI front-end for mplayer.
-    Copyright (C) 2010 Ori Rejwan
+/*  smplayer, GUI front-end for mplayer.
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    umplayer, Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify
@@ -80 +81 @@
 
 void PanelSeeker::setKnobIcon( QPixmap pix )
-{    
+{
     int w = pix.width();
     int h = pix.height();
@@ -88 +89 @@
     knobPix.setPixmap(pix.copy(0, 3*h/4, w, h/4 ), MyIcon::Disabled, MyIcon::Off);
     knobCurrentPix = knobPix.pixmap(MyIcon::Normal, MyIcon::Off);
-    setSliderValue(minimum());
+    /* setSliderValue(minimum()); */
     setState(Normal, true);
 }
 
+/*
 void PanelSeeker::setSingleKnobIcon(QPixmap pix)
 {
@@ -101 +103 @@
     setState(Normal, true);
 }
+*/
 
 void PanelSeeker::mousePressEvent(QMouseEvent *m)
@@ -108 +111 @@
     if(m->button() == Qt::LeftButton)
     {
+        #if QT_VERSION >= 0x050000
+        QPointF pos = m->localPos();
+        #else
         QPointF pos = m->posF();
+        #endif
         if(knobRect.contains(pos))
         {
@@ -120 +127 @@
         {
             isPressed = false;
+            #if QT_VERSION >= 0x050000
+            knobAdjust( m->localPos().x() - knobRect.center().x(), true);
+            #else
             knobAdjust( m->posF().x() - knobRect.center().x(), true);
+            #endif
         }
     }
@@ -130 +141 @@
     if(isPressed)
     {
-        knobAdjust(m->posF().x() - knobRect.center().x() - mousePressDifference );        
+        #if QT_VERSION >= 0x050000
+        knobAdjust(m->localPos().x() - knobRect.center().x() - mousePressDifference );
+        #else
+        knobAdjust(m->posF().x() - knobRect.center().x() - mousePressDifference );
+        #endif
     }
 }