Changeset 168 for smplayer/vendor/current/src/videopreview/videopreview.cpp

Timestamp:

Oct 9, 2014, 11:54:00 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 14.9.0

File:

• smplayer/vendor/current/src/videopreview/videopreview.cpp (modified) (4 diffs)

smplayer/vendor/current/src/videopreview/videopreview.cpp ¶

@@ -68 +68 @@
 
         w_contents = new QWidget(this);
+        w_contents->setContentsMargins(0, 0, 0, 0);
         QPalette p = w_contents->palette();
         p.setColor(w_contents->backgroundRole(), Qt::white);
@@ -80 +81 @@
         grid_layout = new QGridLayout;
         grid_layout->setSpacing(2);
+        grid_layout->setContentsMargins(0, 0, 0, 0);
 
         QVBoxLayout * l = new QVBoxLayout;
+        l->setContentsMargins(4, 4, 4, 4);
+        l->setSpacing(0);
         l->setSizeConstraint(QLayout::SetFixedSize);
         l->addWidget(info);
         l->addLayout(grid_layout);
         l->addWidget(foot);
-        
+
         w_contents->setLayout(l);
 
@@ -325 +329 @@
 
         if (run.thumbnail_width == 0) {
+                qDebug("VideoPreview::addPicture: horizontalSpacing: %d", grid_layout->horizontalSpacing());
                 int spacing = grid_layout->horizontalSpacing() * (prop.n_cols-1);
+                QMargins m = w_contents->layout()->contentsMargins();
+                qDebug("VideoPreview::addPicture: contentsMargins: %d, %d", m.left(), m.right());
+                spacing += (m.left() + m.right());
                 if (spacing < 0) spacing = 0;
                 qDebug("VideoPreview::addPicture: spacing: %d", spacing);
@@ -526 +534 @@
         if (!filename.isEmpty()) {
                 QPixmap image = QPixmap::grabWidget(w_contents);
+                qDebug("VideoPreview::saveImage: size: %d %d", image.size().width(), image.size().height());
+                if (image.size().width() > prop.max_width) {
+                        image = image.scaledToWidth(prop.max_width, Qt::SmoothTransformation);
+                        qDebug("VideoPreview::saveImage: image scaled to : %d %d", image.size().width(), image.size().height());
+                }
                 if (!image.save(filename)) {
                         // Failed!!!