nathan/slide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

[CI SKIP] update deb format
All checks were successful
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2026-02-01 19:35:52 +11:00
parent f4fd1b1b07
commit 3644001dbc
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/build_deb.sh
View File

@@ -66,4 +66,4 @@ Description: Lightweight slideshow for photo frames
Simple, lightweight slideshow designed for low power devices. Simple, lightweight slideshow designed for low power devices.
EOF EOF
dpkg-deb --build "$STAGE_DIR" "$DIST_DIR/${PACKAGE_NAME}_${VERSION}_${ARCH}.deb" dpkg-deb --build -Zgzip "$STAGE_DIR" "$DIST_DIR/${PACKAGE_NAME}_${VERSION}_${ARCH}.deb"

19
src/mainwindow.cpp
View File

@@ -18,6 +18,7 @@
#include <QGraphicsPixmapItem> #include <QGraphicsPixmapItem>
#include <QApplication> #include <QApplication>
#include <QScreen> #include <QScreen>
#include <QTransform>
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
@@ -170,11 +171,11 @@ void MainWindow::updateImage()
return; return;
QLabel *label = this->findChild<QLabel*>("image"); QLabel *label = this->findChild<QLabel*>("image");
const QPixmap* oldImage = label->pixmap(); QPixmap oldImage = label->pixmap(Qt::ReturnByValue);
if (oldImage != NULL && transitionSeconds > 0) if (!oldImage.isNull() && transitionSeconds > 0)
{ {
QPalette palette; QPalette palette;
palette.setBrush(QPalette::Background, *oldImage); palette.setBrush(QPalette::Window, oldImage);
this->setPalette(palette); this->setPalette(palette);
} }
@@ -213,7 +214,7 @@ void MainWindow::updateImage()
label->setPixmap(background); label->setPixmap(background);
if (oldImage != NULL && transitionSeconds > 0) if (!oldImage.isNull() && transitionSeconds > 0)
{ {
auto effect = new QGraphicsOpacityEffect(label); auto effect = new QGraphicsOpacityEffect(label);
effect->setOpacity(0.0); effect->setOpacity(0.0);
@@ -273,9 +274,9 @@ QPixmap MainWindow::getBlurredBackground(const QPixmap& originalSize, const QPix
QPixmap MainWindow::getRotatedPixmap(const QPixmap& p) QPixmap MainWindow::getRotatedPixmap(const QPixmap& p)
{ {
QMatrix matrix; QTransform transform;
matrix.rotate(currentImage.rotation); transform.rotate(currentImage.rotation);
return p.transformed(matrix); return p.transformed(transform);
} }
QPixmap MainWindow::getScaledPixmap(const QPixmap& p) QPixmap MainWindow::getScaledPixmap(const QPixmap& p)
@@ -325,12 +326,12 @@ void MainWindow::drawBackground(const QPixmap& originalSize, const QPixmap& scal
QPixmap background = blur(originalSize.scaledToHeight(height())); QPixmap background = blur(originalSize.scaledToHeight(height()));
QRect rect((background.width() - width())/2, 0, width(), height()); QRect rect((background.width() - width())/2, 0, width(), height());
background = background.copy(rect); background = background.copy(rect);
palette.setBrush(QPalette::Background, background); palette.setBrush(QPalette::Window, background);
} else { } else {
QPixmap background = blur(originalSize.scaledToHeight(height())); QPixmap background = blur(originalSize.scaledToHeight(height()));
QRect rect((background.width() - width())/2, 0, width(), height()); QRect rect((background.width() - width())/2, 0, width(), height());
background = background.copy(rect); background = background.copy(rect);
palette.setBrush(QPalette::Background, background); palette.setBrush(QPalette::Window, background);
} }
this->setPalette(palette); this->setPalette(palette);
} }