Align list items, dont process selected item twice if changed in event loop, mouse button events should only occur when pressing left mouse button

This commit is contained in:
dec05eba
2024-08-03 23:36:11 +02:00
parent c080342fcd
commit 3a20c417cb
13 changed files with 94 additions and 54 deletions

View File

@@ -8,6 +8,7 @@
namespace gsr { namespace gsr {
struct SupportedVideoCodecs { struct SupportedVideoCodecs {
bool h264 = false; bool h264 = false;
bool h264_software = false;
bool hevc = false; bool hevc = false;
bool av1 = false; bool av1 = false;
bool vp8 = false; bool vp8 = false;

View File

@@ -16,6 +16,7 @@ namespace gsr {
void draw(mgl::Window &window, mgl::vec2f offset) override; void draw(mgl::Window &window, mgl::vec2f offset) override;
void add_item(const std::string &text, const std::string &id); void add_item(const std::string &text, const std::string &id);
void set_selected_item(const std::string &id);
mgl::vec2f get_size() override; mgl::vec2f get_size() override;
private: private:

View File

@@ -12,7 +12,13 @@ namespace gsr {
HORIZONTAL HORIZONTAL
}; };
List(Orientation orientation); enum class Alignment {
START,
CENTER,
END
};
List(Orientation orientation, Alignment content_alignment = Alignment::START);
List(const List&) = delete; List(const List&) = delete;
List& operator=(const List&) = delete; List& operator=(const List&) = delete;
@@ -24,5 +30,6 @@ namespace gsr {
protected: protected:
std::vector<std::unique_ptr<Widget>> widgets; std::vector<std::unique_ptr<Widget>> widgets;
Orientation orientation; Orientation orientation;
Alignment content_alignment;
}; };
} }

View File

@@ -54,6 +54,8 @@ namespace gsr {
static void parse_video_codecs_line(GsrInfo *gsr_info, const std::string &line) { static void parse_video_codecs_line(GsrInfo *gsr_info, const std::string &line) {
if(line == "h264") if(line == "h264")
gsr_info->supported_video_codecs.h264 = true; gsr_info->supported_video_codecs.h264 = true;
else if(line == "h264_software")
gsr_info->supported_video_codecs.h264_software = true;
else if(line == "hevc") else if(line == "hevc")
gsr_info->supported_video_codecs.hevc = true; gsr_info->supported_video_codecs.hevc = true;
else if(line == "av1") else if(line == "av1")

View File

@@ -14,7 +14,7 @@ namespace gsr {
bool Button::on_event(mgl::Event &event, mgl::Window&, mgl::vec2f offset) { bool Button::on_event(mgl::Event &event, mgl::Window&, mgl::vec2f offset) {
if(event.type == mgl::Event::MouseMoved) { if(event.type == mgl::Event::MouseMoved) {
mouse_inside = mgl::FloatRect(position + offset, size).contains({ (float)event.mouse_move.x, (float)event.mouse_move.y }); 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; const bool clicked_inside = mouse_inside;
if(clicked_inside && on_click) if(clicked_inside && on_click)
on_click(); on_click();

View File

@@ -46,7 +46,6 @@ namespace gsr {
set_widget_as_selected_in_parent(); set_widget_as_selected_in_parent();
else else
remove_widget_as_selected_in_parent(); remove_widget_as_selected_in_parent();
return false;
} else { } else {
show_dropdown = false; show_dropdown = false;
remove_widget_as_selected_in_parent(); remove_widget_as_selected_in_parent();
@@ -118,6 +117,15 @@ namespace gsr {
dirty = true; 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() { void ComboBox::update_if_dirty() {
if(!dirty) if(!dirty)
return; return;

View File

@@ -30,7 +30,7 @@ namespace gsr {
const mgl::vec2f draw_pos = position + offset; 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 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 }); 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; const bool clicked_inside = mouse_inside;
if(show_dropdown && clicked_inside && mouse_inside_item == -1) { if(show_dropdown && clicked_inside && mouse_inside_item == -1) {

View File

@@ -20,7 +20,7 @@ namespace gsr {
} }
bool Entry::on_event(mgl::Event &event, mgl::Window&, mgl::vec2f offset) { 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 }); 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) { } else if(event.type == mgl::Event::KeyPressed && selected) {
if(event.key.code == mgl::Keyboard::Backspace && !text.get_string().empty()) { if(event.key.code == mgl::Keyboard::Backspace && !text.get_string().empty()) {

View File

@@ -1,22 +1,28 @@
#include "../../include/gui/List.hpp" #include "../../include/gui/List.hpp"
static float floor(float f) {
return (int)f;
}
namespace gsr { namespace gsr {
// TODO: Make this modifiable, multiple by window size. // TODO: Make this modifiable, multiple by window size.
// TODO: Add homogeneous option, using a specified max size of this list. // TODO: Add homogeneous option, using a specified max size of this list.
static const mgl::vec2f spacing(30.0f, 10.0f); 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) { bool List::on_event(mgl::Event &event, mgl::Window &window, mgl::vec2f) {
if(selected_child_widget) { // We want to store the selected child widget since it can change in the event loop below
if(!selected_child_widget->on_event(event, window, mgl::vec2f(0.0f, 0.0f))) Widget *selected_widget = selected_child_widget;
if(selected_widget) {
if(!selected_widget->on_event(event, window, mgl::vec2f(0.0f, 0.0f)))
return false; return false;
} }
// Process widgets by visibility (backwards) // Process widgets by visibility (backwards)
for(auto it = widgets.rbegin(), end = widgets.rend(); it != end; ++it) { 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 // 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))) if(!(*it)->on_event(event, window, mgl::vec2f(0.0f, 0.0f)))
return false; return false;
} }
@@ -27,13 +33,19 @@ namespace gsr {
void List::draw(mgl::Window &window, mgl::vec2f offset) { void List::draw(mgl::Window &window, mgl::vec2f offset) {
mgl::vec2f draw_pos = position + 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) { switch(orientation) {
case Orientation::VERTICAL: { case Orientation::VERTICAL: {
for(auto &widget : widgets) { for(auto &widget : widgets) {
widget->set_position(draw_pos); if(content_alignment == Alignment::CENTER)
if(widget.get() != selected_child_widget) 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)); widget->draw(window, mgl::vec2f(0.0f, 0.0f));
draw_pos.y += widget->get_size().y + spacing.y; draw_pos.y += widget->get_size().y + spacing.y;
} }
@@ -41,8 +53,10 @@ namespace gsr {
} }
case Orientation::HORIZONTAL: { case Orientation::HORIZONTAL: {
for(auto &widget : widgets) { for(auto &widget : widgets) {
widget->set_position(draw_pos); if(content_alignment == Alignment::CENTER)
if(widget.get() != selected_child_widget) 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)); widget->draw(window, mgl::vec2f(0.0f, 0.0f));
draw_pos.x += widget->get_size().x + spacing.x; draw_pos.x += widget->get_size().x + spacing.x;
} }
@@ -50,8 +64,8 @@ namespace gsr {
} }
} }
if(selected_child_widget) if(selected_widget)
selected_child_widget->draw(window, mgl::vec2f(0.0f, 0.0f)); selected_widget->draw(window, mgl::vec2f(0.0f, 0.0f));
} }
void List::add_widget(std::unique_ptr<Widget> widget) { void List::add_widget(std::unique_ptr<Widget> widget) {

View File

@@ -10,15 +10,16 @@ namespace gsr {
bool ScrollablePage::on_event(mgl::Event &event, mgl::Window &window, mgl::vec2f offset) { bool ScrollablePage::on_event(mgl::Event &event, mgl::Window &window, mgl::vec2f offset) {
const mgl::vec2f draw_pos = position + offset; const mgl::vec2f draw_pos = position + offset;
offset = draw_pos + mgl::vec2f(0.0f, get_border_size(window)).floor(); offset = draw_pos + mgl::vec2f(0.0f, get_border_size(window)).floor();
Widget *selected_widget = selected_child_widget;
if(selected_child_widget) { if(selected_widget) {
if(!selected_child_widget->on_event(event, window, offset)) if(!selected_widget->on_event(event, window, offset))
return false; return false;
} }
// Process widgets by visibility (backwards) // Process widgets by visibility (backwards)
for(auto it = widgets.rbegin(), end = widgets.rend(); it != end; ++it) { 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)) if(!(*it)->on_event(event, window, offset))
return false; return false;
} }
@@ -30,6 +31,7 @@ namespace gsr {
void ScrollablePage::draw(mgl::Window &window, mgl::vec2f offset) { void ScrollablePage::draw(mgl::Window &window, mgl::vec2f offset) {
const mgl::vec2f draw_pos = position + offset; const mgl::vec2f draw_pos = position + offset;
offset = draw_pos + mgl::vec2f(0.0f, get_border_size(window)).floor(); offset = draw_pos + mgl::vec2f(0.0f, get_border_size(window)).floor();
Widget *selected_widget = selected_child_widget;
mgl_scissor prev_scissor; mgl_scissor prev_scissor;
mgl_window_get_scissor(window.internal_window(), &prev_scissor); mgl_window_get_scissor(window.internal_window(), &prev_scissor);
@@ -51,12 +53,12 @@ namespace gsr {
window.draw(border); window.draw(border);
for(auto &widget : widgets) { for(auto &widget : widgets) {
if(widget.get() != selected_child_widget) if(widget.get() != selected_widget)
widget->draw(window, offset); widget->draw(window, offset);
} }
if(selected_child_widget) if(selected_widget)
selected_child_widget->draw(window, offset); selected_widget->draw(window, offset);
mgl_window_set_scissor(window.internal_window(), &prev_scissor); mgl_window_set_scissor(window.internal_window(), &prev_scissor);
} }

View File

@@ -8,15 +8,16 @@ namespace gsr {
bool StaticPage::on_event(mgl::Event &event, mgl::Window &window, mgl::vec2f offset) { bool StaticPage::on_event(mgl::Event &event, mgl::Window &window, mgl::vec2f offset) {
const mgl::vec2f draw_pos = position + offset; const mgl::vec2f draw_pos = position + offset;
offset = draw_pos; offset = draw_pos;
Widget *selected_widget = selected_child_widget;
if(selected_child_widget) { if(selected_widget) {
if(!selected_child_widget->on_event(event, window, offset)) if(!selected_widget->on_event(event, window, offset))
return false; return false;
} }
// Process widgets by visibility (backwards) // Process widgets by visibility (backwards)
for(auto it = widgets.rbegin(), end = widgets.rend(); it != end; ++it) { 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)) if(!(*it)->on_event(event, window, offset))
return false; return false;
} }
@@ -28,6 +29,7 @@ namespace gsr {
void StaticPage::draw(mgl::Window &window, mgl::vec2f offset) { void StaticPage::draw(mgl::Window &window, mgl::vec2f offset) {
const mgl::vec2f draw_pos = position + offset; const mgl::vec2f draw_pos = position + offset;
offset = draw_pos; offset = draw_pos;
Widget *selected_widget = selected_child_widget;
mgl_scissor prev_scissor; mgl_scissor prev_scissor;
mgl_window_get_scissor(window.internal_window(), &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); mgl_window_set_scissor(window.internal_window(), &new_scissor);
for(auto &widget : widgets) { for(auto &widget : widgets) {
if(widget.get() != selected_child_widget) if(widget.get() != selected_widget)
widget->draw(window, offset); widget->draw(window, offset);
} }
if(selected_child_widget) if(selected_widget)
selected_child_widget->draw(window, offset); selected_widget->draw(window, offset);
mgl_window_set_scissor(window.internal_window(), &prev_scissor); mgl_window_set_scissor(window.internal_window(), &prev_scissor);
} }

View File

@@ -99,16 +99,6 @@ static Bool set_window_wm_state(Display *display, Window window, Atom atom) {
return True; return True;
} }
static Bool make_window_always_on_top(Display* display, Window window) {
Atom net_wm_state_above_atom = XInternAtom(display, "_NET_WM_STATE_ABOVE", False);
if(!net_wm_state_above_atom) {
fprintf(stderr, "Error: failed to find atom _NET_WM_STATE_ABOVE\n");
return False;
}
return set_window_wm_state(display, window, net_wm_state_above_atom);
}
static Bool make_window_sticky(Display* display, Window window) { static Bool make_window_sticky(Display* display, Window window) {
Atom net_wm_state_sticky_atom = XInternAtom(display, "_NET_WM_STATE_STICKY", False); Atom net_wm_state_sticky_atom = XInternAtom(display, "_NET_WM_STATE_STICKY", False);
if(!net_wm_state_sticky_atom) { if(!net_wm_state_sticky_atom) {
@@ -232,20 +222,35 @@ auto back_button = std::make_unique<gsr::Button>(&title_font, "Back", mgl::vec2f
} }
if(gsr_info.supported_capture_options.portal) if(gsr_info.supported_capture_options.portal)
record_area_box->add_item("Desktop portal", "portal"); record_area_box->add_item("Desktop portal", "portal");
if(!gsr_info.supported_capture_options.monitors.empty())
record_area_box->set_selected_item(gsr_info.supported_capture_options.monitors.front().name);
else if(gsr_info.supported_capture_options.portal)
record_area_box->set_selected_item("portal");
record_area_list->add_widget(std::move(record_area_box)); record_area_list->add_widget(std::move(record_area_box));
} }
settings_list->add_widget(std::move(record_area_list)); settings_list->add_widget(std::move(record_area_list));
auto audio_devices_list = std::make_unique<gsr::List>(gsr::List::Orientation::VERTICAL); auto audio_device_section_list = std::make_unique<gsr::List>(gsr::List::Orientation::VERTICAL);
{ {
audio_devices_list->add_widget(std::make_unique<gsr::Label>(&title_font, "Audio:", gsr::get_theme().text_color)); audio_device_section_list->add_widget(std::make_unique<gsr::Label>(&title_font, "Audio:", gsr::get_theme().text_color));
auto audio_device_box = std::make_unique<gsr::ComboBox>(&title_font); auto audio_devices_list = std::make_unique<gsr::List>(gsr::List::Orientation::VERTICAL);
for(const auto &audio_device : audio_devices) { for(int i = 0; i < 3; ++i) {
audio_device_box->add_item(audio_device.description, audio_device.name); auto audio_device_list = std::make_unique<gsr::List>(gsr::List::Orientation::HORIZONTAL, gsr::List::Alignment::CENTER);
{
audio_device_list->add_widget(std::make_unique<gsr::Label>(&title_font, (std::to_string(1 + i) + ":").c_str(), gsr::get_theme().text_color));
auto audio_device_box = std::make_unique<gsr::ComboBox>(&title_font);
for(const auto &audio_device : audio_devices) {
audio_device_box->add_item(audio_device.description, audio_device.name);
}
audio_device_list->add_widget(std::move(audio_device_box));
}
audio_devices_list->add_widget(std::move(audio_device_list));
} }
audio_devices_list->add_widget(std::move(audio_device_box)); audio_device_section_list->add_widget(std::move(audio_devices_list));
} }
settings_list->add_widget(std::move(audio_devices_list)); settings_list->add_widget(std::move(audio_device_section_list));
auto quality_list = std::make_unique<gsr::List>(gsr::List::Orientation::HORIZONTAL); auto quality_list = std::make_unique<gsr::List>(gsr::List::Orientation::HORIZONTAL);
{ {
@@ -257,6 +262,7 @@ auto back_button = std::make_unique<gsr::Button>(&title_font, "Back", mgl::vec2f
video_quality_box->add_item("High (Recommended for live streaming)", "high"); video_quality_box->add_item("High (Recommended for live streaming)", "high");
video_quality_box->add_item("Very high (Recommended)", "very_high"); video_quality_box->add_item("Very high (Recommended)", "very_high");
video_quality_box->add_item("Ultra", "ultra"); video_quality_box->add_item("Ultra", "ultra");
video_quality_box->set_selected_item("very_high");
video_quality_list->add_widget(std::move(video_quality_box)); video_quality_list->add_widget(std::move(video_quality_box));
} }
quality_list->add_widget(std::move(video_quality_list)); quality_list->add_widget(std::move(video_quality_list));
@@ -274,7 +280,6 @@ auto back_button = std::make_unique<gsr::Button>(&title_font, "Back", mgl::vec2f
auto framerate_list = std::make_unique<gsr::List>(gsr::List::Orientation::VERTICAL); auto framerate_list = std::make_unique<gsr::List>(gsr::List::Orientation::VERTICAL);
{ {
framerate_list->add_widget(std::make_unique<gsr::Label>(&title_font, "Frame rate:", gsr::get_theme().text_color)); framerate_list->add_widget(std::make_unique<gsr::Label>(&title_font, "Frame rate:", gsr::get_theme().text_color));
//create_entry_validator_integer_in_range
auto framerate_entry = std::make_unique<gsr::Entry>(&title_font, "60", title_font.get_character_size() * 2); auto framerate_entry = std::make_unique<gsr::Entry>(&title_font, "60", title_font.get_character_size() * 2);
framerate_entry->validate_handler = gsr::create_entry_validator_integer_in_range(1, 500); framerate_entry->validate_handler = gsr::create_entry_validator_integer_in_range(1, 500);
framerate_list->add_widget(std::move(framerate_entry)); framerate_list->add_widget(std::move(framerate_entry));
@@ -302,7 +307,8 @@ auto back_button = std::make_unique<gsr::Button>(&title_font, "Back", mgl::vec2f
if(gsr_info.supported_video_codecs.vp9) if(gsr_info.supported_video_codecs.vp9)
video_codec_box->add_item("VP9", "vp9"); video_codec_box->add_item("VP9", "vp9");
// TODO: Add hdr options // TODO: Add hdr options
video_codec_box->add_item("H264 Software Encoder (Slow, not recommended)", "h264_software"); if(gsr_info.supported_video_codecs.h264_software)
video_codec_box->add_item("H264 Software Encoder (Slow, not recommended)", "h264_software");
video_codec_list->add_widget(std::move(video_codec_box)); video_codec_list->add_widget(std::move(video_codec_box));
} }
codec_list->add_widget(std::move(video_codec_list)); codec_list->add_widget(std::move(video_codec_list));
@@ -335,10 +341,8 @@ auto back_button = std::make_unique<gsr::Button>(&title_font, "Back", mgl::vec2f
auto save_directory_list = std::make_unique<gsr::List>(gsr::List::Orientation::VERTICAL); auto save_directory_list = std::make_unique<gsr::List>(gsr::List::Orientation::VERTICAL);
{ {
save_directory_list->add_widget(std::make_unique<gsr::Label>(&title_font, "Directory to save the video:", gsr::get_theme().text_color)); save_directory_list->add_widget(std::make_unique<gsr::Label>(&title_font, "Directory to save the video:", gsr::get_theme().text_color));
auto directory_selection_box = std::make_unique<gsr::ComboBox>(&title_font);
// TODO: // TODO:
directory_selection_box->add_item("/home/dec05eba/Videos", "mp4"); save_directory_list->add_widget(std::make_unique<gsr::Entry>(&title_font, "/home/dec05eba/Videos", title_font.get_character_size() * 20));
save_directory_list->add_widget(std::move(directory_selection_box));
} }
file_list->add_widget(std::move(save_directory_list)); file_list->add_widget(std::move(save_directory_list));
@@ -402,10 +406,10 @@ int main(int argc, char **argv) {
window_create_params.max_size = window_size; window_create_params.max_size = window_size;
window_create_params.position = window_pos; window_create_params.position = window_pos;
window_create_params.hidden = true; window_create_params.hidden = true;
//window_create_params.override_redirect = true; window_create_params.override_redirect = true;
window_create_params.background_color = bg_color; window_create_params.background_color = bg_color;
window_create_params.support_alpha = true; window_create_params.support_alpha = true;
window_create_params.window_type = MGL_WINDOW_TYPE_DIALOG; window_create_params.window_type = MGL_WINDOW_TYPE_NOTIFICATION;
mgl::Window window; mgl::Window window;
if(!window.create("gsr overlay", window_create_params)) if(!window.create("gsr overlay", window_create_params))
@@ -700,7 +704,6 @@ int main(int argc, char **argv) {
update_overlay_shape(); update_overlay_shape();
window.set_visible(true); window.set_visible(true);
make_window_always_on_top(display, window.get_system_handle());
make_window_sticky(display, window.get_system_handle()); make_window_sticky(display, window.get_system_handle());
Cursor default_cursor = XCreateFontCursor(display, XC_arrow); Cursor default_cursor = XCreateFontCursor(display, XC_arrow);