replace the separate layout and repaint events with a single "reflow"

event

src/Button.cpp

@@ -31,10 +31,11 @@ void Button::on_paint() {
     auto painter = window()->painter();
     auto text_color = styles()->button_text_color();
     auto max_geometry = current_geometry().max_geometry();
+    bool set_size = current_geometry().max_width() != -1 && current_geometry().max_height() != -1;
 
     painter.source_rgb(text_color);
     painter.set_pango_font_description(styles()->controls_font_description());
-    auto point = painter.text(max_geometry, m_text, PaintTextAlign::Center, PANGO_ELLIPSIZE_END);
+    auto point = painter.text(max_geometry, m_text, PaintTextAlign::Center, PANGO_ELLIPSIZE_END, set_size);
     resize(point);
     painter.fill();
 }

src/Events.hpp

@@ -11,10 +11,20 @@ enum class EventType {
 
     MouseButton,
     MouseMove,
-    WidgetRepaintRequested,
+    Reflow,
     FocusUpdate,
     ActivationUpdate,
-    WidgetRelayoutRequestedEvent
+};
+
+enum class ReflowType {
+    RepaintSubtree,
+    RelayoutSubtree,
+    RepaintSelf
+};
+
+enum class ReflowGrouping {
+    Yes,
+    No
 };
 
 class Event {
@@ -65,26 +75,23 @@ public:
     Point &point() { return m_point; }
 };
 
-class WidgetRepaintRequestedEvent : public Event {
+class ReflowEvent: public Event {
 private:
-    bool m_should_do_group { false };
+    ReflowType m_reflow_type;
+    ReflowGrouping m_reflow_grouping;
 public:
-    WidgetRepaintRequestedEvent(bool should_do_group)
-        : m_should_do_group(should_do_group) {}
+    ReflowEvent(ReflowType type, ReflowGrouping grouping)
+        : m_reflow_type(type)
+        , m_reflow_grouping(grouping) {}
 
-    EventType type() { return EventType::WidgetRepaintRequested; }
-    const char *name() { return "WidgetRepaintRequested"; }
+    EventType type() { return EventType::Reflow; }
+    const char *name() { return "Reflow"; }
 
-    bool should_do_group() { return m_should_do_group; }
-    void set_should_do_group(bool should_do_group) { m_should_do_group = should_do_group; }
-};
+    ReflowType reflow_type() { return m_reflow_type; }
+    ReflowGrouping reflow_grouping() { return m_reflow_grouping; }
 
-class WidgetRelayoutRequestedEvent : public Event {
-public:
-    WidgetRelayoutRequestedEvent() {}
-
-    EventType type() { return EventType::WidgetRelayoutRequestedEvent; }
-    const char *name() { return "WidgetRelayoutRequestedEvent"; }
+    void set_reflow_grouping(ReflowGrouping reflow_grouping) { m_reflow_grouping = reflow_grouping; }
+    void set_reflow_type(ReflowType reflow_type) { m_reflow_type = reflow_type; }
 };
 
 class FocusUpdateEvent : public Event {

src/Label.cpp

@@ -20,10 +20,11 @@ void Label::on_paint() {
     auto painter = window()->painter();
     auto text_color = styles()->label_text_color();
     auto text_geometry = current_geometry().max_geometry();
+    bool set_size = current_geometry().max_width() != -1 && current_geometry().max_height() != -1;
 
     painter.source_rgb(text_color);
     painter.set_pango_font_description(styles()->controls_font_description());
-    auto point = painter.text(text_geometry, m_text, PaintTextAlign::Left, PANGO_ELLIPSIZE_NONE);
+    auto point = painter.text(text_geometry, m_text, PaintTextAlign::Left, PANGO_ELLIPSIZE_NONE, set_size);
     resize(point);
     painter.fill();
 }

src/Painter.cpp

@@ -39,7 +39,7 @@ bool Painter::text(Point &where, std::string &text) {
     return true;
 }
 
-Point Painter::text(Box &geometry, std::string &text, PaintTextAlign align, PangoEllipsizeMode ellipsize) {
+Point Painter::text(Box &geometry, std::string &text, PaintTextAlign align, PangoEllipsizeMode ellipsize, bool set_size) {
     if (m_pango_font_description == nullptr)
         return {-1,-1};
 
@@ -51,9 +51,9 @@ Point Painter::text(Box &geometry, std::string &text, PaintTextAlign align, Pang
     int pango_height;
 
     pango_layout_set_font_description(layout, m_pango_font_description);
-    if (geometry.width() > 0)
+    if (geometry.width() > 0 && set_size)
         pango_layout_set_width(layout, pango_units_from_double(geometry.width()));
-    if (geometry.height() > 0)
+    if (geometry.height() > 0 && set_size)
         pango_layout_set_height(layout, pango_units_from_double(geometry.height()));
     pango_layout_set_ellipsize(layout, ellipsize);
     pango_layout_set_text(layout, text.c_str(), -1);

src/Painter.hpp

@@ -29,7 +29,7 @@ public:
 
     void rounded_rectangle(Box &geometry, double border_radius);
     bool text(Point &where, std::string &text);
-    Point text(Box &geometry, std::string &text, PaintTextAlign align, PangoEllipsizeMode ellipsize);
+    Point text(Box &geometry, std::string &text, PaintTextAlign align, PangoEllipsizeMode ellipsize, bool set_size);
 
     bool can_paint() { if (m_cairo) return true; else return false; }
 

src/Widget.cpp

@@ -31,10 +31,8 @@ void Widget::move_to(double x, double y) {
 }
 
 void Widget::do_layout() {
-    if (m_layout) {
+    if (m_layout)
         m_layout->run();
-        wants_repaint(); // TODO: should relayout really repaint as well?
-    }
 }
 
 void Widget::set_layout(std::shared_ptr<Layout> layout) {
@@ -114,7 +112,7 @@ void Widget::wants_full_relayout() {
     m_window->dispatch_full_relayout();
 }
 
-void Widget::handle_repaint(WidgetRepaintRequestedEvent &event) {
+void Widget::handle_reflow(ReflowEvent &event) {
     // immediately accept the event - we will do our own propagation logic
     event.accept();
 
@@ -122,29 +120,35 @@ void Widget::handle_repaint(WidgetRepaintRequestedEvent &event) {
         return;
 
     auto painter = m_window->painter();
-
     if (!painter.can_paint())
         return;
 
     auto cr = painter.cairo();
-    auto event_should_do_group = event.should_do_group();
+    auto grouping = event.reflow_grouping();
+    auto type = event.reflow_type();
 
-    if (event_should_do_group) {
+    if (grouping == ReflowGrouping::Yes) {
         painter.begin_paint_group();
     }
 
+    if (type == ReflowType::RelayoutSubtree) {
+        do_layout();
+    }
+
     cr->save();
     on_paint();
     cr->restore();
 
+    if (type != ReflowType::RepaintSelf) {
         // we will propagate this event to all of our children, except it will have
         // should_do_group set to false
-    event.set_should_do_group(false);
+        event.set_reflow_grouping(ReflowGrouping::No);
         for (auto& child : m_children) {
             child->dispatch_event(event);
         }
+    }
 
-    if (event_should_do_group) {
+    if (grouping == ReflowGrouping::Yes) {
         painter.end_paint_group();
     }
 }
@@ -207,12 +211,8 @@ void Widget::dispatch_event(Event &event) {
             handle_mouse_button_event(reinterpret_cast<MouseButtonEvent&>(event));
             break;
         }
-        case EventType::WidgetRepaintRequested: {
-            handle_repaint(reinterpret_cast<WidgetRepaintRequestedEvent&>(event));
-            break;
-        }
-        case EventType::WidgetRelayoutRequestedEvent: {
-            do_layout();
+        case EventType::Reflow: {
+            handle_reflow(reinterpret_cast<ReflowEvent&>(event));
             break;
         }
         /* these events aren't handled here, as they won't be dispatched to us from other places */

src/Widget.hpp

@@ -132,7 +132,7 @@ private:
     void wants_full_repaint();
     void wants_full_relayout();
     void do_layout();
-    void handle_repaint(WidgetRepaintRequestedEvent& event);
+    void handle_reflow(ReflowEvent& event);
     void handle_mouse_move_event(MouseMoveEvent &event);
     void handle_mouse_button_event(MouseButtonEvent &event);
 };

src/Window.cpp

@@ -61,12 +61,12 @@ bool Window::spawn_window() {
 }
 
 void Window::widget_repaint(Widget *target) {
-    auto event = WidgetRepaintRequestedEvent(true);
+    auto event = ReflowEvent(ReflowType::RepaintSubtree, ReflowGrouping::Yes);
     target->dispatch_event(event);
 }
 
 void Window::widget_relayout(Widget *target) {
-    auto event = WidgetRelayoutRequestedEvent();
+    auto event = ReflowEvent(ReflowType::RelayoutSubtree, ReflowGrouping::Yes);
     target->dispatch_event(event);
 }
 
@@ -79,12 +79,12 @@ bool Window::dispatch_to_main_widget(Event &event) {
 }
 
 bool Window::dispatch_full_repaint() {
-    auto event = WidgetRepaintRequestedEvent(true);
+    auto event = ReflowEvent(ReflowType::RepaintSubtree, ReflowGrouping::Yes);
     return dispatch_to_main_widget(event);
 }
 
 bool Window::dispatch_full_relayout() {
-    auto event = WidgetRelayoutRequestedEvent();
+    auto event = ReflowEvent(ReflowType::RelayoutSubtree, ReflowGrouping::Yes);
     return dispatch_to_main_widget(event);
 }
 
@@ -118,7 +118,6 @@ void Window::run(bool block) {
             }
             case Expose: {
                 if (e.xexpose.count == 0) {
-                    // TODO: hack
                     // might run into issues with other X implementations... :(
                     dispatch_full_repaint();
                 }