From 84e10d516a9e2f95bbd55f05f7c1c232401d053b Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Tue, 20 Jul 2021 21:25:10 +0200
Subject: [PATCH] UI: A much better close button
---
src/UI/MainWindow.cc | 2 +-
src/UI/TitleBar.cc | 14 ++++----------
src/UI/VivyDocumentView.cc | 2 +-
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/UI/MainWindow.cc b/src/UI/MainWindow.cc
index 66169d37..08eb9cdd 100644
--- a/src/UI/MainWindow.cc
+++ b/src/UI/MainWindow.cc
@@ -39,7 +39,7 @@
using namespace Vivy;
MainWindow::MainWindow() noexcept
- : Window(QIcon(":icons/vivy.png"), "Vivy")
+ : Window(QIcon(VIVY_ICON_APP), "Vivy")
{
/* Some declarations */
DCL_MENU(file, "&File");
diff --git a/src/UI/TitleBar.cc b/src/UI/TitleBar.cc
index 15d936b8..0142aa5a 100644
--- a/src/UI/TitleBar.cc
+++ b/src/UI/TitleBar.cc
@@ -19,7 +19,7 @@ TitleBar::TitleBar(const QIcon &icon, const QString &title, QWidget *parent) noe
auto *iconLabel = new QLabel(this); // Index 0
titleLabel = new QLabel("<h2>" + title + "</h2>", this); // Index 1
- auto *closeButton = new QPushButton(parent == nullptr ? "Quit" : "Close", this);
+ auto *closeButton = new QPushButton(this);
connect(closeButton, &QAbstractButton::clicked, this,
[=, this]() noexcept -> void { emit closed(); });
@@ -30,15 +30,9 @@ TitleBar::TitleBar(const QIcon &icon, const QString &title, QWidget *parent) noe
closeButton->setFlat(true);
closeButton->setDefault(false);
closeButton->setStyleSheet("color: #1394B4;"
- "font-size: 14px;"
- "border-color: #1394B4;"
- "border-width: 1px;"
- "border-radius: 2px;"
- "padding-top: 2px;"
- "padding-bottom: 2px;"
- "padding-left: 5px;"
- "padding-right: 5px;"
- "border-style: solid;");
+ "border: none;"
+ "icon: url(" VIVY_ICON_CLOSE ");"
+ "icon-size: 22px;");
titleLayout->addWidget(iconLabel);
titleLayout->addWidget(titleLabel);
diff --git a/src/UI/VivyDocumentView.cc b/src/UI/VivyDocumentView.cc
index d8af3d93..bd03841a 100644
--- a/src/UI/VivyDocumentView.cc
+++ b/src/UI/VivyDocumentView.cc
@@ -145,7 +145,7 @@ VivyDocumentView::closeDocument() noexcept
QIcon
VivyDocumentView::getDocumentTabIcon() const noexcept
{
- return QIcon(":/icons/vivy.png");
+ return QIcon(VIVY_ICON_APP);
}
void
--
GitLab