1 files changed, 37 insertions, 15 deletions

diff --git a/src/gui/ScrollablePage.cpp b/src/gui/ScrollablePage.cpp
index 74dd715..cec20d3 100644
--- a/src/gui/ScrollablePage.cpp
+++ b/src/gui/ScrollablePage.cpp
@@ -15,19 +15,49 @@ namespace gsr {
 
     ScrollablePage::ScrollablePage(mgl::vec2f size) : size(size) {}
 
+    ScrollablePage::~ScrollablePage() {
+        widgets.for_each([this](std::unique_ptr<Widget> &widget) {
+            if(widget->parent_widget == this)
+                widget->parent_widget = nullptr;
+            return true;
+        }, true);
+    }
+
     bool ScrollablePage::on_event(mgl::Event &event, mgl::Window &window, mgl::vec2f offset) {
         if(!visible)
             return true;
 
-        offset = position + offset + mgl::vec2f(0.0f, scroll_y);
+        offset = position + offset;
+
+        const mgl::vec2f content_size = get_inner_size();
+        const mgl::vec2i scissor_pos(offset.x, offset.y);
+        const mgl::vec2i scissor_size(content_size.x, content_size.y);
+
+        offset.y += scroll_y;
         Widget *selected_widget = selected_child_widget;
 
+        if(event.type == mgl::Event::MouseButtonPressed && scrollbar_rect.contains(mgl::vec2f(event.mouse_button.x, event.mouse_button.y))) {
+            set_widget_as_selected_in_parent();
+            moving_scrollbar_with_cursor = true;
+            scrollbar_move_cursor_start_pos = mgl::vec2f(event.mouse_button.x, event.mouse_button.y);
+            scrollbar_move_cursor_scroll_y_start = scroll_y;
+            return false;
+        }
+
         if(event.type == mgl::Event::MouseButtonReleased && moving_scrollbar_with_cursor) {
             moving_scrollbar_with_cursor = false;
             remove_widget_as_selected_in_parent();
             return false;
         }
 
+        if(event.type == mgl::Event::MouseButtonPressed || event.type == mgl::Event::MouseButtonReleased) {
+            if(!mgl::IntRect(scissor_pos, scissor_size).contains({event.mouse_button.x, event.mouse_button.y}))
+                return true;
+        } else if(event.type == mgl::Event::MouseMoved) {
+            if(!mgl::IntRect(scissor_pos, scissor_size).contains({event.mouse_move.x, event.mouse_move.y}))
+                return true;
+        }
+
         if(selected_widget) {
             if(!selected_widget->on_event(event, window, offset))
                 return false;
@@ -35,8 +65,9 @@ namespace gsr {
 
         // Process widgets by visibility (backwards)
         const bool continue_events = widgets.for_each_reverse([selected_widget, &window, &event, offset](std::unique_ptr<Widget> &widget) {
-            if(widget.get() != selected_widget) {
-                if(!widget->on_event(event, window, offset))
+            Widget *p = widget.get();
+            if(p != selected_widget) {
+                if(!p->on_event(event, window, offset))
                     return false;
             }
             return true;
@@ -51,14 +82,6 @@ namespace gsr {
             return false;
         }
 
-        if(event.type == mgl::Event::MouseButtonPressed && scrollbar_rect.contains(mgl::vec2f(event.mouse_button.x, event.mouse_button.y))) {
-            set_widget_as_selected_in_parent();
-            moving_scrollbar_with_cursor = true;
-            scrollbar_move_cursor_start_pos = mgl::vec2f(event.mouse_button.x, event.mouse_button.y);
-            scrollbar_move_cursor_scroll_y_start = scroll_y;
-            return false;
-        }
-
         return true;
     }
 
@@ -75,11 +98,10 @@ namespace gsr {
 
         offset = position + offset;
 
-        mgl_scissor prev_scissor;
-        mgl_window_get_scissor(window.internal_window(), &prev_scissor);
+        const mgl::Scissor prev_scissor = window.get_scissor();
 
         const mgl::vec2f content_size = get_inner_size();
-        mgl_scissor new_scissor = {
+        const mgl_scissor new_scissor = {
             mgl_vec2i{(int)offset.x, (int)offset.y},
             mgl_vec2i{(int)content_size.x, (int)content_size.y}
         };
@@ -136,7 +158,7 @@ namespace gsr {
         apply_animation();
         limit_scroll(child_height);
 
-        mgl_window_set_scissor(window.internal_window(), &prev_scissor);
+        window.set_scissor(prev_scissor);
 
         double scrollbar_height = 1.0;
         if(child_height > 0.001)