Changeset 176 for smplayer/trunk/src/skingui/mediapanel.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/skingui/mediapanel.cpp (modified) (5 diffs)

smplayer/trunk/src/skingui/mediapanel.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
     umplayer, Copyright (C) 2010 Ori Rejwan
 
@@ -130 +130 @@
 }
 
+void MediaPanel::setScrollingEnabled(bool b) {
+        mediaLabel->setScrollingEnabled(b);
+}
+
 void MediaPanel::paintEvent(QPaintEvent * e) {
         QPainter p(this);
@@ -282 +286 @@
         }
 
-        if (rect.width() > width()) {
-                timerId = startTimer(20);
+        if (scrolling_enabled) {
+                if (rect.width() > width()) {
+                        timerId = startTimer(20);
+                }
         }
 }
@@ -293 +299 @@
 }
 
-
 ScrollingLabel::ScrollingLabel(QWidget* parent ) {
         scrollPos =0;
         timerId = -1;
+        scrolling_enabled = false;
         textRect = QRect();
         setAttribute(Qt::WA_StyledBackground, true);
@@ -302 +308 @@
 }
 
+void ScrollingLabel::setScrollingEnabled(bool b) {
+        scrolling_enabled = b;
+        updateLabel();
+        repaint();
+}
+
 void ScrollingLabel::resizeEvent(QResizeEvent *) {
         updateLabel();