Do not call UpdateFixedBounds in constructor of Widget

Author: fido2020

LibGUI/include/Lemon/GUI/Model.h

@@ -52,7 +52,7 @@ class DataModel {
     ///
     /// \return Column name
     /////////////////////////////
-    virtual const std::string& ColumnName(int column) const = 0;
+    virtual const char* ColumnName(int column) const = 0;
 
     /////////////////////////////
     /// \brief Sort by specified column (optional)

LibGUI/include/Lemon/GUI/Widgets.h

@@ -47,13 +47,7 @@ class Widget {
     inline Widget* GetParent() { return parent; }
 
     virtual void SetLayout(LayoutSize newSizeX, LayoutSize newSizeY, WidgetAlignment newAlign = WAlignLeft,
-                           WidgetAlignment newAlignVert = WAlignTop) {
-        sizeX = newSizeX;
-        sizeY = newSizeY;
-        align = newAlign;
-        verticalAlign = newAlignVert;
-        UpdateFixedBounds();
-    };
+                           WidgetAlignment newAlignVert = WAlignTop);
 
     virtual void Paint(surface_t* surface);
 
@@ -91,9 +85,6 @@ class Widget {
     Widget* parent = nullptr;
     Window* window = nullptr;
 
-    short layoutSizeX = LayoutSize::Fixed;
-    short layoutSizeY = LayoutSize::Fixed;
-
     rect_t bounds;
     rect_t fixedBounds;
 
@@ -145,6 +136,10 @@ class LayoutContainer : public Container {
     int xPadding = 2;
     int yPadding = 2;
 
+    // Whether or not the LayoutContainer should expand the Widgets
+    // to fill the width of the container
+    bool xFill = false;
+
     LayoutContainer(rect_t bounds, vector2i_t itemSize);
 
     void AddWidget(Widget* w);
@@ -218,6 +213,8 @@ class Button : public Widget {
 
     Button(const char* _label, rect_t _bounds);
 
+    void SetLabel(const char* _label);
+
     virtual void Paint(surface_t* surface);
     virtual void OnMouseDown(vector2i_t mousePos);
     virtual void OnMouseUp(vector2i_t mousePos);

LibGUI/src/Widgets.cpp

@@ -20,12 +20,19 @@ Widget::Widget(rect_t bounds, LayoutSize newSizeX, LayoutSize newSizeY) {
 
     sizeX = newSizeX;
     sizeY = newSizeY;
-
-    UpdateFixedBounds();
 }
 
 Widget::~Widget() {}
 
+void Widget::SetLayout(LayoutSize newSizeX, LayoutSize newSizeY, WidgetAlignment newAlign,
+                        WidgetAlignment newAlignVert) {
+    sizeX = newSizeX;
+    sizeY = newSizeY;
+    align = newAlign;
+    verticalAlign = newAlignVert;
+    UpdateFixedBounds();
+};
+
 void Widget::Paint(__attribute__((unused)) surface_t* surface) {}
 
 void Widget::OnMouseEnter(vector2i_t mousePos) { OnMouseMove(mousePos); }
@@ -258,7 +265,7 @@ void Container::UpdateFixedBounds() {
 //////////////////////////
 // LayoutContainer
 //////////////////////////
-LayoutContainer::LayoutContainer(rect_t bounds, vector2i_t itemSize) : Container(bounds) { this->itemSize = itemSize; }
+LayoutContainer::LayoutContainer(rect_t bounds, vector2i_t minItemSize) : Container(bounds) { this->itemSize = minItemSize; }
 
 void LayoutContainer::AddWidget(Widget* w) {
     Container::AddWidget(w);
@@ -275,20 +282,33 @@ void LayoutContainer::RemoveWidget(Widget* w) {
 void LayoutContainer::UpdateFixedBounds() {
     Widget::UpdateFixedBounds();
 
+    if(!children.size()) {
+        return;
+    }
+
     vector2i_t pos = {xPadding, yPadding};
     isOverflowing = false;
 
+    int itemWidth = itemSize.x;
+    int itemHeight = itemSize.y;
+    int itemsPerRow = (fixedBounds.width - xPadding) / (itemSize.x + xPadding);
+
+    // Fill the width of the container if requested
+    if(xFill && itemsPerRow >= (int)children.size()) {
+        itemWidth = ((fixedBounds.width - xPadding) / children.size()) - xPadding;
+    }
+
     for (Widget* w : children) {
-        w->SetBounds({pos, itemSize});
+        w->SetBounds({pos, {itemWidth, itemHeight}});
         w->SetLayout(LayoutSize::Fixed, LayoutSize::Fixed, WidgetAlignment::WAlignLeft);
 
         w->UpdateFixedBounds();
 
-        pos.x += itemSize.x + xPadding;
+        pos.x += itemWidth + xPadding;
 
-        if (pos.x + itemSize.x > fixedBounds.width) {
+        if (pos.x + itemWidth > fixedBounds.width) {
             pos.x = xPadding;
-            pos.y += itemSize.y + yPadding;
+            pos.y += itemHeight + yPadding;
         }
     }
 
@@ -304,6 +324,11 @@ Button::Button(const char* _label, rect_t _bounds) : Widget(_bounds) {
     labelLength = Graphics::GetTextLength(label.c_str());
 }
 
+void Button::SetLabel(const char* _label) {
+    label = _label;
+    labelLength = Graphics::GetTextLength(label.c_str());
+}
+
 void Button::DrawButtonLabel(surface_t* surface) {
     rgba_colour_t colour;
     vector2i_t btnPos = fixedBounds.pos;
@@ -814,7 +839,7 @@ void ListView::Paint(surface_t* surface) {
     int xPos = fixedBounds.x;
     for (int i = 0; i < model->ColumnCount(); i++) {
         if (displayColumnNames) {
-            Graphics::DrawString(model->ColumnName(i).c_str(), xPos + 4, fixedBounds.y + 4, textColour.r, textColour.g,
+            Graphics::DrawString(model->ColumnName(i), xPos + 4, fixedBounds.y + 4, textColour.r, textColour.g,
                                  textColour.b, surface);
 
             Graphics::DrawRect(xPos, fixedBounds.y + 1, 1, columnDisplayHeight - 2, textColour, surface); // Divider

LibGUI/src/Window.cpp

@@ -1,5 +1,6 @@
 #include <Lemon/Core/JSON.h>
 #include <Lemon/Core/SharedMemory.h>
+#include <Lemon/Core/Logger.h>
 #include <Lemon/GUI/Window.h>
 
 #include <Lemon/GUI/WindowServer.h>
@@ -12,11 +13,18 @@
 namespace Lemon::GUI {
 Window::Window(const char* title, vector2i_t size, uint32_t flags, int type, vector2i_t pos)
     : rootContainer({{0, 0}, size}), m_flags(flags), m_windowType(type) {
-    rootContainer.SetWindow(this);
-
     WindowServer* server = WindowServer::Instance();
-    rootContainer.background = Theme::Current().ColourBackground();
+    if(!server) {
+        Logger::Error("Failed to connect to lemonwm!");
+        exit(1);
+    }
+
+    if(m_windowType == WindowType::GUI) {
+        rootContainer.SetWindow(this);
+        rootContainer.background = Theme::Current().ColourBackground();
+    }
 
+    assert(server);
     auto response = server->CreateWindow(pos.x, pos.y, size.x, size.y, flags, title);
 
     m_windowBufferKey = response.bufferKey;
@@ -56,13 +64,15 @@ void Window::Relocate(vector2i_t pos) { WindowServer::Instance()->Relocate(m_win
 void Window::Resize(vector2i_t size) {
     Lemon::UnmapSharedMemory(m_windowBufferInfo, m_windowBufferKey);
 
-    if (menuBar) {
-        rootContainer.SetBounds({{0, WINDOW_MENUBAR_HEIGHT}, {size.x, size.y - WINDOW_MENUBAR_HEIGHT}});
-    } else {
-        rootContainer.SetBounds({{0, 0}, size});
-    }
+    if(m_windowType == WindowType::GUI) {
+        if (menuBar) {
+            rootContainer.SetBounds({{0, WINDOW_MENUBAR_HEIGHT}, {size.x, size.y - WINDOW_MENUBAR_HEIGHT}});
+        } else {
+            rootContainer.SetBounds({{0, 0}, size});
+        }
 
-    rootContainer.UpdateFixedBounds();
+        rootContainer.UpdateFixedBounds();
+    }
 
     m_windowBufferKey = WindowServer::Instance()->Resize(m_windowID, size.x, size.y).bufferKey;
     if (m_windowBufferKey <= 0) {
@@ -93,8 +103,8 @@ void Window::UpdateFlags(uint32_t flags) {
 }
 
 void Window::SwapBuffers() {
-    if (m_windowBufferInfo->drawing)
-        return;
+    while (m_windowBufferInfo->drawing)
+        ; // WM is currently drawing the other buffer
 
     if (surface.buffer == m_buffer1) {
         m_windowBufferInfo->currentBuffer = 0;
@@ -137,13 +147,13 @@ bool Window::PollEvent(LemonEvent& ev) {
 
 void Window::GUIPollEvents() {
     LemonEvent ev;
-    while (PollEvent(ev)) {
+    while (!closed && PollEvent(ev)) {
         // If the handler returns true, the event is not processed.
         auto handler = m_eventHandlers.find(ev.event);
         if (handler != m_eventHandlers.end() && handler->second(ev)) {
             continue;
         }
-
+        
         GUIHandleEvent(ev);
     }