gui/libui/include/ui/App.h

@@ -61,7 +61,6 @@ namespace ui
         HashMap<int, OwnedPtr<Window>> m_windows;
         bool m_should_close { false };
         os::EventLoop m_loop;
-        Vector<int> m_window_clear_queue;
 
         bool process_events();
 

gui/libui/include/ui/Window.h

@@ -80,12 +80,6 @@ namespace ui
             return m_id;
         }
 
-        void on_close(os::Action&& action)
-        {
-            m_on_close_action = move(action);
-            m_has_on_close_action = true;
-        }
-
         ~Window();
 
       private:
@@ -99,9 +93,6 @@ namespace ui
         Option<int> m_old_mouse_buttons;
         bool m_decorated { false };
 
-        os::Action m_on_close_action;
-        bool m_has_on_close_action { false };
-
         struct ShortcutAction
         {
             bool intercept;

gui/libui/src/App.cpp

@@ -75,7 +75,7 @@ namespace ui
     void App::unregister_window(Window* window, Badge<Window>)
     {
         int id = window->id();
-        m_window_clear_queue.try_append(id);
+        check(m_windows.try_remove(id));
     }
 
     Window* App::find_window(int id)
@@ -124,15 +124,6 @@ namespace ui
     {
         check(m_main_window);
         m_client->check_for_messages().release_value();
-        for (int id : m_window_clear_queue)
-        {
-            check(m_windows.try_remove(id));
-
-            ui::CloseWindowRequest request;
-            request.window = id;
-            client().send_async(request);
-        }
-        m_window_clear_queue.clear_data();
         return !m_should_close;
     }
 }

gui/libui/src/Window.cpp

@@ -84,8 +84,6 @@ namespace ui
     Window::~Window()
     {
         if (m_canvas.ptr) munmap(m_canvas.ptr, ((usize)m_canvas.width) * ((usize)m_canvas.height) * 4);
-
-        if (m_has_on_close_action) m_on_close_action();
     }
 
     void Window::set_title(StringView title)
@@ -110,6 +108,10 @@ namespace ui
     {
         App& app = App::the();
 
+        ui::CloseWindowRequest request;
+        request.window = m_id;
+        app.client().send_async(request);
+
         if (this == app.main_window()) app.set_should_close(true);
 
         app.unregister_window(this, {});

libos/include/os/Action.h

@@ -44,15 +44,6 @@ namespace os
             other.m_action = {};
         }
 
-        /**
-         * @brief Construct a new Action object, copying it from another one.
-         *
-         * @param other The old Action object to copy from.
-         */
-        Action(Action& other) : m_action(other.m_action)
-        {
-        }
-
         /**
          * @brief Construct a new Action object, copying it from another one.
          *
@@ -152,7 +143,7 @@ namespace os
          *
          * @param other The old Function object to move from. This object will become invalid.
          */
-        Function(Function<Args...>&& other) : m_action(other.m_action)
+        Function(Function&& other) : m_action(other.m_action)
         {
             other.m_action = {};
         }
@@ -162,16 +153,7 @@ namespace os
          *
          * @param other The old Function object to copy from.
          */
-        Function(Function<Args...>& other) : m_action(other.m_action)
-        {
-        }
-
-        /**
-         * @brief Construct a new Function object, copying it from another one.
-         *
-         * @param other The old Function object to copy from.
-         */
-        Function(const Function<Args...>& other) : m_action(other.m_action)
+        Function(const Function& other) : m_action(other.m_action)
         {
         }
 
@@ -212,43 +194,24 @@ namespace os
             return m_action->call(args...);
         }
 
-        /**
-         * @brief Call the underlying object.
-         */
-        void operator()(Args... args) const
-        {
-            expect(m_action, "os::Function called with no underlying callable object");
-            return m_action->call(args...);
-        }
-
       private:
         class FunctionBase : public Shareable
         {
           public:
             virtual void call(Args... args) = 0;
-            virtual void call(Args... args) const = 0;
             virtual ~FunctionBase() = default;
         };
 
         template <typename T> class FunctionImpl final : public FunctionBase
         {
           public:
-            FunctionImpl(FunctionImpl<T>&& function) : m_function(move(function.m_function))
-            {
-            }
-
             FunctionImpl(T&& function) : m_function(move(function))
             {
             }
 
             void call(Args... args) override
             {
-                m_function(args...);
-            }
-
-            void call(Args... args) const override
-            {
-                m_function(args...);
+                return m_function(args...);
             }
 
           private: