From 7965f73b64018bbac155c4e2c3208350dae69954 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Fri, 6 Nov 2020 20:44:12 +0200 Subject: Remove data/resources.qrc --- src/util.h | 98 ++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 38 deletions(-) (limited to 'src/util.h') diff --git a/src/util.h b/src/util.h index 6882854..8431a5b 100644 --- a/src/util.h +++ b/src/util.h @@ -9,7 +9,8 @@ #ifndef SMOLBOTE_UTIL_H #define SMOLBOTE_UTIL_H -#include "icons.h" +#include "poi_icons.h" +#include "poi_logos.h" #include #include #include @@ -20,53 +21,74 @@ namespace Util { const QStringList files(const QString &location, const QStringList &nameFilters = QStringList()); -template -inline QIcon icon() +constexpr auto AppIcon = QStyle::SP_CustomBase + 1; +constexpr auto AppWindowIcon = QStyle::SP_CustomBase + 2; + +[[nodiscard]] inline QPixmap render(const auto &data, const QSize size = QSize()) { - using namespace std::literals; + QSvgRenderer renderer; + renderer.load(QByteArray(data.data(), static_cast(data.size()))); - constexpr auto data = icons::get([] { - switch(id) { - case QStyle::SP_ArrowBack: - return "arrow-left.svg"sv; - case QStyle::SP_ArrowForward: - return "arrow-right.svg"sv; - case QStyle::SP_BrowserStop: - return "circle-x.svg"sv; - case QStyle::SP_BrowserReload: - return "refresh.svg"sv; - case QStyle::SP_DirHomeIcon: - return "home.svg"sv; - default: - return "__unknown__"sv; - } - }); + QPixmap pm(size.isValid() ? size : renderer.defaultSize()); + pm.fill(Qt::transparent); - QIcon m; + QPainter painter(&pm); + renderer.render(&painter, pm.rect()); - // This is a horrible hack that will one day be hopefully fixed: - // When rendering an svg, you can't actually pick a stroke color through - // QPainter::setBrush or QPainter::setPen. So instead, replace the stroke - // color in the data (stroke="currentColor") and then rerender it. + return pm; +} - QSvgRenderer renderer; - QByteArray arr(data.data(), data.size()); - for(const auto mode : { QIcon::Normal /*, QIcon::Disabled, QIcon::Active, QIcon::Selected*/ }) { - for(const auto toggle : { QIcon::On, QIcon::Off }) { - renderer.load(arr.replace("currentColor", (toggle == QIcon::On ? "black" : "gray"))); +template +inline QIcon icon() +{ + using namespace std::literals; + + if constexpr(id >= QStyle::SP_CustomBase) { + constexpr auto data = logos::get([] { + switch(id) { + case AppIcon: + return "poi.svg"sv; + case AppWindowIcon: + return "poi_window.svg"sv; + default: + return "__unknown__"sv; + } + }); + return QIcon(render(data)); + } else { - QPixmap pm(renderer.defaultSize()); - pm.fill(Qt::transparent); + constexpr auto data = icons::get([] { + switch(id) { + case QStyle::SP_ArrowBack: + return "arrow-left.svg"sv; + case QStyle::SP_ArrowForward: + return "arrow-right.svg"sv; + case QStyle::SP_BrowserStop: + return "circle-x.svg"sv; + case QStyle::SP_BrowserReload: + return "refresh.svg"sv; + case QStyle::SP_DirHomeIcon: + return "home.svg"sv; + default: + return "__unknown__"sv; + } + }); - QPainter painter(&pm); - painter.setBrush(Qt::green); - painter.setPen(Qt::green); - renderer.render(&painter, pm.rect()); + QIcon m; + // This is a horrible hack that will one day be hopefully fixed: + // When rendering an svg, you can't actually pick a stroke color through + // QPainter::setBrush or QPainter::setPen. So instead, replace the stroke + // color in the data (stroke="currentColor") and then rerender it. - m.addPixmap(pm, mode, toggle); + QByteArray arr(data.data(), data.size()); + for(const auto mode : { QIcon::Normal /*, QIcon::Disabled, QIcon::Active, QIcon::Selected*/ }) { + for(const auto toggle : { QIcon::On, QIcon::Off }) { + const auto pm = render(arr.replace("currentColor", (toggle == QIcon::On ? "black" : "gray"))); + m.addPixmap(pm, mode, toggle); + } } + return m; } - return m; } } // namespace Util -- cgit v1.2.1