add png support

.gitignore

@@ -3,3 +3,4 @@ buildclang/
 releaseclang/
 .cache/
 compile_commands.json
+

pkg/makepkg/PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=libraven
-pkgver=r84.2fa09ab
+pkgver=r85.5663552
 pkgrel=1
 pkgdesc='The Raven user interface library'
 url='https://git.hippoz.xyz/hippoz/raven'

src/Painter.cpp

@@ -1,5 +1,6 @@
 #include "Painter.hpp"
 #include "RGB.hpp"
+#include "cairomm/surface.h"
 #include "pango/pango-layout.h"
 #include "pango/pango-types.h"
 #include "pango/pangocairo.h"
@@ -101,4 +102,11 @@ void Painter::flush_paint_group() {
     m_cairo->get_target()->flush();
 }
 
+Point Painter::png(std::string path) {
+    auto image = Cairo::ImageSurface::create_from_png(path.c_str());
+    m_cairo->set_source(image, 0, 0);
+
+    return Point(image->get_width(), image->get_height());
+}
+
 }

src/Painter.hpp

@@ -30,6 +30,7 @@ public:
     bool can_paint() { if (m_cairo) return true; else return false; }
 
     void source_rgb(RGB source_rgb);
+    Point png(std::string path);
     void fill();
 
     void begin_paint_group();

src/Widget.cpp

@@ -9,6 +9,14 @@
 
 namespace Raven {
 
+Painter *Widget::painter() {
+    if (!window()) {
+        return nullptr;
+    }
+
+    return &window()->painter();
+}
+
 Point Widget::compute_window_relative() {
     Point point = { 0, 0 };
     for (Widget* parent = m_parent; parent; parent = parent->parent()) {

src/Widget.hpp

@@ -11,6 +11,7 @@
 #include "RGB.hpp"
 #include "GenericStyle.hpp"
 #include "Styles.hpp"
+#include "Window.hpp"
 
 namespace Raven {
 
@@ -70,6 +71,8 @@ public:
     Window *window() { return m_window; }
     void set_window(Window *window);
 
+    Painter *painter();
+
     GenericStyle *style() { return m_style; }
     void set_style(GenericStyle *style) { m_style = style; reflow(); }
     void set_style_pure(GenericStyle *style) { m_style = style; }

src/main.cpp

@@ -16,6 +16,19 @@
 #include <memory>
 #include <string>
 
+class Fish : public Raven::Widget {
+public:
+    Fish()
+        : Raven::Widget() {}
+protected:
+    void on_paint() {
+        if (!painter()) return;
+
+        painter()->png("tuna.png");
+        painter()->cairo()->paint();
+    }
+};
+
 int main() {
     Raven::Window window {};
     window.spawn_window();
@@ -35,10 +48,7 @@ int main() {
     auto new_button = top_bar->add<Raven::Button>("add");
     new_button->rect().set_max_width(50);
     new_button->on_click = [container_widget]() {
-        auto button = container_widget->add<Raven::Button>("button");
-        button->on_click = [button]() {
-            button->set_style(&Raven::accent_button_style);
-        };
+        container_widget->add<Fish>();
     };
     auto remove_button = top_bar->add<Raven::Button>("remove");
     remove_button->on_click = [container_widget]() {