webengine: remove dependency on autogen/utilsdevel

4 files changed, 119 insertions, 85 deletions

diff --git a/src/autogen/CMakeLists.txt b/src/autogen/CMakeLists.txt
index c5c7614..f97526f 100644
--- a/src/autogen/CMakeLists.txt
+++ b/src/autogen/CMakeLists.txt
@@ -29,7 +29,7 @@ add_custom_command(OUTPUT poi_icons.h DEPENDS ${poi_icons}
 add_custom_target(py_autogen DEPENDS settings.h poi_logos.h poi_icons.h)
 
 add_library(autogen INTERFACE)
-target_sources(autogen INTERFACE util.h util.cpp)
+target_sources(autogen INTERFACE util.h util.cpp applicationstyle.h applicationstyle.cpp)
 target_include_directories(autogen INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(autogen INTERFACE Qt5::Svg)
+target_link_libraries(autogen INTERFACE fmt Qt5::Svg)
 add_dependencies(autogen py_autogen)
diff --git a/src/autogen/applicationstyle.cpp b/src/autogen/applicationstyle.cpp
new file mode 100644
index 0000000..40c93d3
--- /dev/null
+++ b/src/autogen/applicationstyle.cpp
@@ -0,0 +1,91 @@
+/*
+ * This file is part of smolbote. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from its original
+ * location: https://neueland.iserlohn-fortress.net/cgit/smolbote
+ *
+ * SPDX-License-Identifier: GPL-3.0
+ */
+
+#include "applicationstyle.h"
+#include "poi_icons.h"
+#include "poi_logos.h"
+#include <QPainter>
+#include <QStyleFactory>
+#include <QSvgRenderer>
+#include <spdlog/spdlog.h>
+
+[[nodiscard]] inline QPixmap render(const auto &data, const QSize size = QSize())
+{
+    QSvgRenderer renderer;
+    renderer.load(QByteArray(data.data(), static_cast<int>(data.size())));
+
+    QPixmap pm(size.isValid() ? size : renderer.defaultSize());
+    pm.fill(Qt::transparent);
+
+    QPainter painter(&pm);
+    renderer.render(&painter, pm.rect());
+
+    return pm;
+}
+
+ApplicationStyle::ApplicationStyle()
+    : QProxyStyle(QStyleFactory::create("fusion"))
+{
+}
+
+QIcon ApplicationStyle::standardIcon(QStyle::StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *w) const
+{
+    using namespace std::literals;
+
+    if(standardPixmap == QStyle::SP_MediaVolume) {
+        auto on = render(icons::get([] { return "volume-3.svg"sv; }));
+        auto off = render(icons::get([] { return "volume.svg"sv; }));
+        QIcon m;
+        m.addPixmap(on, QIcon::Normal, QIcon::On);
+        m.addPixmap(off, QIcon::Normal, QIcon::Off);
+        return m;
+    }
+
+    const auto id = [standardPixmap]() {
+        switch(standardPixmap) {
+        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;
+        }
+    }();
+
+    const auto *const data = std::find_if(icons::entries.begin(), icons::entries.end(), [id](const auto &tuple) -> bool {
+        return std::get<0>(tuple) == id;
+    });
+
+    if(data == icons::entries.end()) {
+        spdlog::error("fixme: getting default fusion icon for StandardPixmap({})", standardPixmap);
+        return QStyleFactory::create("fusion")->standardIcon(standardPixmap, opt, w);
+    }
+
+    const auto d = std::get<1>(*data);
+    return QIcon(render(d));
+}
+
+QIcon ApplicationStyle::applicationIcon()
+{
+    using namespace std::literals;
+    constexpr auto d = logos::get([]{ return "poi.svg"sv; });
+    return QIcon(render(d));
+}
+
+QIcon ApplicationStyle::windowIcon()
+{
+    using namespace std::literals;
+    constexpr auto d = logos::get([]{ return "poi_window.svg"sv; });
+    return QIcon(render(d));
+}
diff --git a/src/autogen/applicationstyle.h b/src/autogen/applicationstyle.h
new file mode 100644
index 0000000..f9bf1bd
--- /dev/null
+++ b/src/autogen/applicationstyle.h
@@ -0,0 +1,26 @@
+/*
+ * This file is part of smolbote. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from its original
+ * location: https://neueland.iserlohn-fortress.net/cgit/smolbote
+ *
+ * SPDX-License-Identifier: GPL-3.0
+ */
+
+#ifndef SMOLBOTE_APPLICATION_STYLE_H
+#define SMOLBOTE_APPLICATION_STYLE_H
+
+#include <QProxyStyle>
+
+class ApplicationStyle : public QProxyStyle
+{
+public:
+    ApplicationStyle();
+    ~ApplicationStyle() override = default;
+
+    QIcon standardIcon(QStyle::StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const override;
+
+    static QIcon applicationIcon();
+    static QIcon windowIcon();
+};
+
+#endif
\ No newline at end of file
diff --git a/src/autogen/util.h b/src/autogen/util.h
index 822794a..aa3e954 100644
--- a/src/autogen/util.h
+++ b/src/autogen/util.h
@@ -9,95 +9,12 @@
 #ifndef SMOLBOTE_UTIL_H
 #define SMOLBOTE_UTIL_H
 
-#include "poi_icons.h"
-#include "poi_logos.h"
-#include <QIcon>
-#include <QPainter>
 #include <QStringList>
-#include <QStyle>
-#include <QSvgRenderer>
 
 namespace Util {
 
 const QStringList files(const QString &location, const QStringList &nameFilters = QStringList());
 
-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())
-{
-    QSvgRenderer renderer;
-    renderer.load(QByteArray(data.data(), static_cast<int>(data.size())));
-
-    QPixmap pm(size.isValid() ? size : renderer.defaultSize());
-    pm.fill(Qt::transparent);
-
-    QPainter painter(&pm);
-    renderer.render(&painter, pm.rect());
-
-    return pm;
-}
-
-template </*QStyle::StandardPixmap*/ unsigned int id>
-inline QIcon icon()
-{
-    using namespace std::literals;
-
-    if constexpr(id == QStyle::SP_MediaVolume) {
-        auto on = render(icons::get([] { return "volume-3.svg"sv; }));
-        auto off = render(icons::get([] { return "volume.svg"sv; }));
-        QIcon m;
-        m.addPixmap(on, QIcon::Normal, QIcon::On);
-        m.addPixmap(off, QIcon::Normal, QIcon::Off);
-        return m;
-
-    } else 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 {
-
-        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;
-            }
-        });
-
-        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.
-
-        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;
-    }
-}
 } // namespace Util
 
 #endif // SMOLBOTE_UTIL_H