From 3a20c417cbf7d5db1d9d26abfbda388e58f96c18 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 3 Aug 2024 23:36:11 +0200 Subject: Align list items, dont process selected item twice if changed in event loop, mouse button events should only occur when pressing left mouse button --- src/gui/Button.cpp | 2 +- src/gui/ComboBox.cpp | 10 +++++++++- src/gui/DropdownButton.cpp | 2 +- src/gui/Entry.cpp | 2 +- src/gui/List.cpp | 36 +++++++++++++++++++++++++----------- src/gui/ScrollablePage.cpp | 14 ++++++++------ src/gui/StaticPage.cpp | 14 ++++++++------ 7 files changed, 53 insertions(+), 27 deletions(-) (limited to 'src/gui') diff --git a/src/gui/Button.cpp b/src/gui/Button.cpp index b530004..eb5932b 100644 --- a/src/gui/Button.cpp +++ b/src/gui/Button.cpp @@ -14,7 +14,7 @@ namespace gsr { bool Button::on_event(mgl::Event &event, mgl::Window&, mgl::vec2f offset) { if(event.type == mgl::Event::MouseMoved) { mouse_inside = mgl::FloatRect(position + offset, size).contains({ (float)event.mouse_move.x, (float)event.mouse_move.y }); - } else if(event.type == mgl::Event::MouseButtonPressed) { + } else if(event.type == mgl::Event::MouseButtonPressed && event.mouse_button.button == mgl::Mouse::Left) { const bool clicked_inside = mouse_inside; if(clicked_inside && on_click) on_click(); diff --git a/src/gui/ComboBox.cpp b/src/gui/ComboBox.cpp index 03e66bd..3aa4439 100644 --- a/src/gui/ComboBox.cpp +++ b/src/gui/ComboBox.cpp @@ -46,7 +46,6 @@ namespace gsr { set_widget_as_selected_in_parent(); else remove_widget_as_selected_in_parent(); - return false; } else { show_dropdown = false; remove_widget_as_selected_in_parent(); @@ -118,6 +117,15 @@ namespace gsr { dirty = true; } + void ComboBox::set_selected_item(const std::string &id) { + for(size_t i = 0; i < items.size(); ++i) { + if(items[i].id == id) { + selected_item = i; + break; + } + } + } + void ComboBox::update_if_dirty() { if(!dirty) return; diff --git a/src/gui/DropdownButton.cpp b/src/gui/DropdownButton.cpp index 1d7374b..fa51aac 100644 --- a/src/gui/DropdownButton.cpp +++ b/src/gui/DropdownButton.cpp @@ -30,7 +30,7 @@ namespace gsr { const mgl::vec2f draw_pos = position + offset; const mgl::vec2f collision_margin(1.0f, 1.0f); // Makes sure that multiple buttons that are next to each other wont activate at the same time when the cursor is right between them mouse_inside = mgl::FloatRect(draw_pos + collision_margin, size - collision_margin).contains({ (float)event.mouse_move.x, (float)event.mouse_move.y }); - } else if(event.type == mgl::Event::MouseButtonPressed) { + } else if(event.type == mgl::Event::MouseButtonPressed && event.mouse_button.button == mgl::Mouse::Left) { const bool clicked_inside = mouse_inside; if(show_dropdown && clicked_inside && mouse_inside_item == -1) { diff --git a/src/gui/Entry.cpp b/src/gui/Entry.cpp index 09ec167..bf0f1ad 100644 --- a/src/gui/Entry.cpp +++ b/src/gui/Entry.cpp @@ -20,7 +20,7 @@ namespace gsr { } bool Entry::on_event(mgl::Event &event, mgl::Window&, mgl::vec2f offset) { - if(event.type == mgl::Event::MouseButtonPressed) { + if(event.type == mgl::Event::MouseButtonPressed && event.mouse_button.button == mgl::Mouse::Left) { selected = mgl::FloatRect(position + offset, get_size()).contains({ (float)event.mouse_button.x, (float)event.mouse_button.y }); } else if(event.type == mgl::Event::KeyPressed && selected) { if(event.key.code == mgl::Keyboard::Backspace && !text.get_string().empty()) { diff --git a/src/gui/List.cpp b/src/gui/List.cpp index 10be76f..4a74f62 100644 --- a/src/gui/List.cpp +++ b/src/gui/List.cpp @@ -1,22 +1,28 @@ #include "../../include/gui/List.hpp" +static float floor(float f) { + return (int)f; +} + namespace gsr { // TODO: Make this modifiable, multiple by window size. // TODO: Add homogeneous option, using a specified max size of this list. static const mgl::vec2f spacing(30.0f, 10.0f); - List::List(Orientation orientation) : orientation(orientation) {} + List::List(Orientation orientation, Alignment content_alignment) : orientation(orientation), content_alignment(content_alignment) {} bool List::on_event(mgl::Event &event, mgl::Window &window, mgl::vec2f) { - if(selected_child_widget) { - if(!selected_child_widget->on_event(event, window, mgl::vec2f(0.0f, 0.0f))) + // We want to store the selected child widget since it can change in the event loop below + Widget *selected_widget = selected_child_widget; + if(selected_widget) { + if(!selected_widget->on_event(event, window, mgl::vec2f(0.0f, 0.0f))) return false; } // Process widgets by visibility (backwards) for(auto it = widgets.rbegin(), end = widgets.rend(); it != end; ++it) { // Ignore offset because widgets are positioned with offset in ::draw, this solution is simpler - if(it->get() != selected_child_widget) { + if(it->get() != selected_widget) { if(!(*it)->on_event(event, window, mgl::vec2f(0.0f, 0.0f))) return false; } @@ -27,13 +33,19 @@ namespace gsr { void List::draw(mgl::Window &window, mgl::vec2f offset) { mgl::vec2f draw_pos = position + offset; + offset = {0.0f, 0.0f}; + Widget *selected_widget = selected_child_widget; + + // TODO: Handle start/end alignment + const mgl::vec2f size = get_size(); - // TODO: Do same vertical/horizontal alignment for items switch(orientation) { case Orientation::VERTICAL: { for(auto &widget : widgets) { - widget->set_position(draw_pos); - if(widget.get() != selected_child_widget) + if(content_alignment == Alignment::CENTER) + offset.x = floor(size.x * 0.5f - widget->get_size().x * 0.5f); + widget->set_position(draw_pos + offset); + if(widget.get() != selected_widget) widget->draw(window, mgl::vec2f(0.0f, 0.0f)); draw_pos.y += widget->get_size().y + spacing.y; } @@ -41,8 +53,10 @@ namespace gsr { } case Orientation::HORIZONTAL: { for(auto &widget : widgets) { - widget->set_position(draw_pos); - if(widget.get() != selected_child_widget) + if(content_alignment == Alignment::CENTER) + offset.y = floor(size.y * 0.5f - widget->get_size().y * 0.5f); + widget->set_position(draw_pos + offset); + if(widget.get() != selected_widget) widget->draw(window, mgl::vec2f(0.0f, 0.0f)); draw_pos.x += widget->get_size().x + spacing.x; } @@ -50,8 +64,8 @@ namespace gsr { } } - if(selected_child_widget) - selected_child_widget->draw(window, mgl::vec2f(0.0f, 0.0f)); + if(selected_widget) + selected_widget->draw(window, mgl::vec2f(0.0f, 0.0f)); } void List::add_widget(std::unique_ptr widget) { diff --git a/src/gui/ScrollablePage.cpp b/src/gui/ScrollablePage.cpp index de036b9..73b445e 100644 --- a/src/gui/ScrollablePage.cpp +++ b/src/gui/ScrollablePage.cpp @@ -10,15 +10,16 @@ namespace gsr { bool ScrollablePage::on_event(mgl::Event &event, mgl::Window &window, mgl::vec2f offset) { const mgl::vec2f draw_pos = position + offset; offset = draw_pos + mgl::vec2f(0.0f, get_border_size(window)).floor(); + Widget *selected_widget = selected_child_widget; - if(selected_child_widget) { - if(!selected_child_widget->on_event(event, window, offset)) + if(selected_widget) { + if(!selected_widget->on_event(event, window, offset)) return false; } // Process widgets by visibility (backwards) for(auto it = widgets.rbegin(), end = widgets.rend(); it != end; ++it) { - if(it->get() != selected_child_widget) { + if(it->get() != selected_widget) { if(!(*it)->on_event(event, window, offset)) return false; } @@ -30,6 +31,7 @@ namespace gsr { void ScrollablePage::draw(mgl::Window &window, mgl::vec2f offset) { const mgl::vec2f draw_pos = position + offset; offset = draw_pos + mgl::vec2f(0.0f, get_border_size(window)).floor(); + Widget *selected_widget = selected_child_widget; mgl_scissor prev_scissor; mgl_window_get_scissor(window.internal_window(), &prev_scissor); @@ -51,12 +53,12 @@ namespace gsr { window.draw(border); for(auto &widget : widgets) { - if(widget.get() != selected_child_widget) + if(widget.get() != selected_widget) widget->draw(window, offset); } - if(selected_child_widget) - selected_child_widget->draw(window, offset); + if(selected_widget) + selected_widget->draw(window, offset); mgl_window_set_scissor(window.internal_window(), &prev_scissor); } diff --git a/src/gui/StaticPage.cpp b/src/gui/StaticPage.cpp index 1194d0f..a6d9b64 100644 --- a/src/gui/StaticPage.cpp +++ b/src/gui/StaticPage.cpp @@ -8,15 +8,16 @@ namespace gsr { bool StaticPage::on_event(mgl::Event &event, mgl::Window &window, mgl::vec2f offset) { const mgl::vec2f draw_pos = position + offset; offset = draw_pos; + Widget *selected_widget = selected_child_widget; - if(selected_child_widget) { - if(!selected_child_widget->on_event(event, window, offset)) + if(selected_widget) { + if(!selected_widget->on_event(event, window, offset)) return false; } // Process widgets by visibility (backwards) for(auto it = widgets.rbegin(), end = widgets.rend(); it != end; ++it) { - if(it->get() != selected_child_widget) { + if(it->get() != selected_widget) { if(!(*it)->on_event(event, window, offset)) return false; } @@ -28,6 +29,7 @@ namespace gsr { void StaticPage::draw(mgl::Window &window, mgl::vec2f offset) { const mgl::vec2f draw_pos = position + offset; offset = draw_pos; + Widget *selected_widget = selected_child_widget; mgl_scissor prev_scissor; mgl_window_get_scissor(window.internal_window(), &prev_scissor); @@ -39,12 +41,12 @@ namespace gsr { mgl_window_set_scissor(window.internal_window(), &new_scissor); for(auto &widget : widgets) { - if(widget.get() != selected_child_widget) + if(widget.get() != selected_widget) widget->draw(window, offset); } - if(selected_child_widget) - selected_child_widget->draw(window, offset); + if(selected_widget) + selected_widget->draw(window, offset); mgl_window_set_scissor(window.internal_window(), &prev_scissor); } -- cgit v1.2.3