Changeset 181 for smplayer/trunk/src/mpcgui/mpcstyles.cpp

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/mpcgui/mpcstyles.cpp (modified) (10 diffs)

smplayer/trunk/src/mpcgui/mpcstyles.cpp

@@ -19 +19 @@
 #include "mpcstyles.h"
 
-#include <QWindowsStyle>
+#include <QProxyStyle>
 #include <QStyleOptionToolBar>
 #include <QSlider>
 #include <QPainter>
-
+#include <qdrawutil.h>
 
 void
@@ -79 +79 @@
             else
             {
-                QWindowsStyle::drawControl(control,toolbar, painter, widget);
+                QProxyStyle::drawControl(control,toolbar, painter, widget);
             }
         }
@@ -85 +85 @@
     else
     {
-        QWindowsStyle::drawControl(control,option, painter, widget);
+        QProxyStyle::drawControl(control,option, painter, widget);
     }
 }
@@ -109 +109 @@
                             };
                     QPen oldPen = p->pen();
-                    
+
                     p->setPen(slider->palette.dark().color());
                     p->drawLine(QPoint(points[0].x(), points[0].y() -2 ),QPoint(points[2].x(), points[2].y()));
@@ -128 +128 @@
 
             if (slider->subControls & SC_SliderHandle) {
+                /*
                 const QColor c0 = slider->palette.shadow().color();
                 const QColor c1 = slider->palette.dark().color();
@@ -133 +134 @@
                 const QColor c3 = slider->palette.midlight().color();
                 const QColor c4 = slider->palette.light().color();
+                */
                 QBrush handleBrush;
 
@@ -164 +166 @@
     else
     {
-        QWindowsStyle::drawComplexControl(cc,opt,p,widget);
+        QProxyStyle::drawComplexControl(cc,opt,p,widget);
     }
 }
@@ -197 +199 @@
 
             if (slider->subControls & SC_SliderHandle) {
+                /*
                 const QColor c0 = slider->palette.shadow().color();
                 const QColor c1 = slider->palette.dark().color();
@@ -202 +205 @@
                 const QColor c3 = slider->palette.midlight().color();
                 const QColor c4 = slider->palette.light().color();
+                */
                 QBrush handleBrush;
 
@@ -234 +238 @@
     else
     {
-        QWindowsStyle::drawComplexControl(cc,opt,p,widget);
+        QProxyStyle::drawComplexControl(cc,opt,p,widget);
     }
 }