[vlc-commits] commit: Qt/EPG: Fix an EPGitem position issue. (Adrien Maglo )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Adrien Maglo <magsoft at videolan.org> | Fri Jun 18 19:14:40 2010 +0200| [48514572feed9ad74f0b8b2f1b1242d610dabcf2] | committer: Jean-Baptiste Kempf 

Qt/EPG: Fix an EPGitem position issue.
This was wrong to update the EPGItem start times when changing the EPGView start time.
(cherry picked from commit 330016cb7d533bc6c5d7946c66aa26b9944eb830)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=48514572feed9ad74f0b8b2f1b1242d610dabcf2
---

 modules/gui/qt4/components/epg/EPGItem.cpp |   11 ++++++++---
 modules/gui/qt4/components/epg/EPGItem.hpp |    1 +
 modules/gui/qt4/components/epg/EPGView.cpp |    6 ++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt4/components/epg/EPGItem.cpp b/modules/gui/qt4/components/epg/EPGItem.cpp
index 9e6f44e..15bdf46 100644
--- a/modules/gui/qt4/components/epg/EPGItem.cpp
+++ b/modules/gui/qt4/components/epg/EPGItem.cpp
@@ -111,14 +111,13 @@ void EPGItem::setChannel( int channelNb )
 {
     //qDebug() << "Channel" << channelNb;
     m_channelNb = channelNb;
-    setPos( pos().x(), m_channelNb * TRACKS_HEIGHT );
+    updatePos();
 }
 
 void EPGItem::setStart( const QDateTime& start )
 {
     m_start = start;
-    int x = m_view->startTime().secsTo( start );
-    setPos( x, pos().y() );
+    updatePos();
 }
 
 void EPGItem::setDuration( int duration )
@@ -147,6 +146,12 @@ void EPGItem::setCurrent( bool current )
     m_current = current;
 }
 
+void EPGItem::updatePos()
+{
+    int x = m_view->startTime().secsTo( m_start );
+    setPos( x, m_channelNb * TRACKS_HEIGHT );
+}
+
 void EPGItem::focusInEvent( QFocusEvent * event )
 {
     EPGEvent *evEPG = new EPGEvent( m_name );
diff --git a/modules/gui/qt4/components/epg/EPGItem.hpp b/modules/gui/qt4/components/epg/EPGItem.hpp
index fd531ca..04f9909 100644
--- a/modules/gui/qt4/components/epg/EPGItem.hpp
+++ b/modules/gui/qt4/components/epg/EPGItem.hpp
@@ -52,6 +52,7 @@ public:
     void setDescription( const QString& description );
     void setShortDescription( const QString& shortDescription );
     void setCurrent( bool current );
+    void updatePos();
 
 protected:
     virtual void focusInEvent( QFocusEvent * event );
diff --git a/modules/gui/qt4/components/epg/EPGView.cpp b/modules/gui/qt4/components/epg/EPGView.cpp
index 5a8da87..aa2a614 100644
--- a/modules/gui/qt4/components/epg/EPGView.cpp
+++ b/modules/gui/qt4/components/epg/EPGView.cpp
@@ -56,17 +56,15 @@ void EPGView::setStartTime( const QDateTime& startTime )
 {
     QList<QGraphicsItem*> itemList = items();
 
-    int diff = startTime.secsTo( m_startTime );
+    m_startTime = startTime;
 
     for ( int i = 0; i < itemList.count(); ++i )
     {
         EPGItem* item = qgraphicsitem_cast<EPGItem*>( itemList.at( i ) );
         if ( !item ) continue;
-        item->setStart( item->start().addSecs( diff ) );
+        item->setStart( item->start() );
     }
 
-    m_startTime = startTime;
-
     // Our start time has changed
     emit startTimeChanged( startTime );
 }