fix batch system

src/Label.cpp

@@ -28,7 +28,7 @@ void Label::on_paint() {
     auto geometry = rect().max_geometry();
 
     painter.source_rgb(style()->foreground());
-    painter.text(geometry, m_text, PaintTextAlign::Left, PANGO_ELLIPSIZE_END, style()->font_description());
+    painter.text(geometry, m_text, m_align, PANGO_ELLIPSIZE_END, style()->font_description());
     painter.fill();
 }
 

src/Label.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Widget.hpp"
+#include "Painter.hpp"
 
 namespace Raven {
 
@@ -10,15 +11,24 @@ public:
         : Widget(WidgetType::Label)
         , m_text(text) {}
 
+    Label(std::string text, PaintTextAlign align)
+        : Widget(WidgetType::Label)
+        , m_text(text)
+        , m_align(align) {}
+
     ~Label() {}
 
     void set_text(std::string text);
     std::string &text() { return m_text; }
+
+    PaintTextAlign &align() { return m_align; }
+    void set_align(PaintTextAlign align) { m_align = align; }
 protected:
     void on_paint();
     void on_init();
 private:
     std::string m_text;
+    PaintTextAlign m_align { PaintTextAlign::Left };
 };
 
 }

src/Widget.cpp

@@ -90,6 +90,10 @@ bool Widget::add_child(std::shared_ptr<Widget> child) {
     if (child->parent()) {
         return false;
     }
+
+    if (window())
+        window()->start_batch();
+
     m_children.push_back(child);
     child->set_parent(this);
 
@@ -98,6 +102,9 @@ bool Widget::add_child(std::shared_ptr<Widget> child) {
     // after we call set_window() on it.
     child->set_window(m_window);
 
+    if (window())
+        window()->end_batch();
+
     return true;
 }
 

src/Window.cpp

@@ -73,10 +73,8 @@ bool Window::dispatch_to_main_widget(Event &event) {
 
 void Window::repaint(Box geometry) {
     m_did_repaint_during_batch = true;
-
+    if (m_batches)
-    if (m_is_batching) {
         return;
-    }
 
     auto event = RepaintRectEvent(true, geometry);
     dispatch_to_main_widget(event);
@@ -92,10 +90,8 @@ void Window::repaint() {
 
 void Window::relayout(Widget *target) {
     m_did_relayout_during_batch = true;
-
+    if (m_batches)
-    if (m_is_batching) {
         return;
-    }
 
     auto event = RelayoutSubtreeEvent();
     target->dispatch_event(event);
@@ -103,10 +99,8 @@ void Window::relayout(Widget *target) {
 
 void Window::relayout() {
     m_did_relayout_during_batch = true;
-
+    if (m_batches)
-    if (m_is_batching) {
         return;
-    }
 
     auto event = RelayoutSubtreeEvent();
     dispatch_to_main_widget(event);
@@ -118,20 +112,29 @@ void Window::reflow() {
 }
 
 void Window::start_batch() {
-    m_is_batching = true;
+    m_batches++;
-    m_did_relayout_during_batch = false;
-    m_did_repaint_during_batch = false;
 }
 
 void Window::end_batch() {
-    if (m_is_batching) {
+    if (m_batches < 1)
-        m_is_batching = false;
+        return;
+
+    // we are only interested in performing batch operations for the last batch
+    if (m_batches > 1) {
+        m_batches--;
+        return;
+    }
+
+    m_batches = 0;
+
     if (m_did_relayout_during_batch) {
         reflow();
     } else if (m_did_repaint_during_batch) {
         repaint();
     }
-    }
+
+    m_did_relayout_during_batch = false;
+    m_did_repaint_during_batch = false;
 }
 
 void Window::run(bool block) {

src/Window.hpp

@@ -56,9 +56,9 @@ private:
     Box m_rect { 0, 0, 800, 600 };
     Painter m_painter {};
     Cairo::RefPtr<Cairo::XlibSurface> m_xlib_surface { nullptr };
-    bool m_is_batching { true };
+    int m_batches { 1 };
-    bool m_did_relayout_during_batch { true };
     bool m_did_repaint_during_batch { false };
+    bool m_did_relayout_during_batch { false };
 
     Display *m_x_display { nullptr };