From f183fc1dd2c59f28834489583e9d3db6dd262e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 22 Jan 2021 16:35:58 +0100 Subject: [PATCH] Fallback to a text close button if we can't load the svg image If the svg plugin is missing the user can't see where the close button is --- custom_widgets/whats_new_dialog.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/custom_widgets/whats_new_dialog.cpp b/custom_widgets/whats_new_dialog.cpp index 24bce2ab..b5c4b429 100644 --- a/custom_widgets/whats_new_dialog.cpp +++ b/custom_widgets/whats_new_dialog.cpp @@ -87,11 +87,19 @@ YACReader::WhatsNewDialog::WhatsNewDialog(QWidget *parent) auto closeButton = new QPushButton(this); closeButton->setFlat(true); closeButton->setStyleSheet("background-color:transparent;"); - closeButton->setIcon(QPixmap(":/images/custom_dialog/custom_close_button.svg")); - closeButton->setIconSize(QSize(44, 44)); - closeButton->setFixedSize(44, 44); - - closeButton->move(656, 20); + auto closeIcon = QPixmap(":/images/custom_dialog/custom_close_button.svg"); + if (!closeIcon.isNull()) { + closeButton->setIcon(QPixmap(":/images/custom_dialog/custom_close_button.svg")); + closeButton->setIconSize(QSize(44, 44)); + closeButton->setFixedSize(44, 44); + closeButton->move(656, 20); + } else { + closeButton->setText(tr("Close")); + auto font = closeButton->font(); + font.setPointSize(16); + closeButton->setFont(font); + closeButton->move(616, 20); + } scrollArea->setFixedSize(720, 640); setFixedSize(720, 640);