From 26e5a5958331f2466daa66d9ed27b78fe987338d Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Fri, 22 Nov 2024 22:10:46 +0100 Subject: [PATCH] UI Remove text field from combobox --- src/UI/UI_combobox.cpp | 6 +++--- src/UI/UI_combobox.hpp | 8 ++++---- tests/UI_combobox.cpp | 4 ++-- tools/simulators/test_sim.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/UI/UI_combobox.cpp b/src/UI/UI_combobox.cpp index 6729443..02b8f01 100644 --- a/src/UI/UI_combobox.cpp +++ b/src/UI/UI_combobox.cpp @@ -4,9 +4,9 @@ UI_combobox::UI_combobox(QObject *parrent) : UI_x_boxes(UI_COMBOBOX_TYPE, parren { } -UI_combobox::UI_combobox(std::string text, Color fg_color, Color bg_color, - std::vector options, size_t selected, QObject *parrent) - : UI_x_boxes(UI_COMBOBOX_TYPE, text, fg_color, bg_color, options, parrent), m_selected(selected) +UI_combobox::UI_combobox(Color fg_color, Color bg_color, + std::vector options, size_t selected, QObject *parent) + : UI_x_boxes(UI_COMBOBOX_TYPE, "", fg_color, bg_color, options, parent), m_selected(selected) { } diff --git a/src/UI/UI_combobox.hpp b/src/UI/UI_combobox.hpp index a7580d2..d2851b6 100644 --- a/src/UI/UI_combobox.hpp +++ b/src/UI/UI_combobox.hpp @@ -10,10 +10,10 @@ class UI_combobox : public UI_x_boxes { Q_OBJECT public: - UI_combobox(QObject *parrent = nullptr); - UI_combobox(std::string text, Color fg_color, Color bg_color, std::vector options, - size_t selected = 0, QObject *parrent = nullptr); - UI_combobox(const json &j, QObject *parrent = nullptr); + UI_combobox(QObject *parent = nullptr); + UI_combobox(Color fg_color, Color bg_color, std::vector options, + size_t selected = 0, QObject *parent = nullptr); + UI_combobox(const json &j, QObject *parent = nullptr); void set_selected(size_t selected); void set_selected(std::string selected) override; diff --git a/tests/UI_combobox.cpp b/tests/UI_combobox.cpp index dacbc1c..60d6bd7 100644 --- a/tests/UI_combobox.cpp +++ b/tests/UI_combobox.cpp @@ -2,11 +2,11 @@ TEST(UI_combobox, to_from_json) { - UI_combobox checkbox("checkbox_text", Color(255, 255, 255), Color(0, 0, 0), {"option1", "option2"}); + UI_combobox checkbox(Color(255, 255, 255), Color(0, 0, 0), {"option1", "option2"}); json j = checkbox.to_json(0); UI_combobox checkbox2(j); EXPECT_EQ(checkbox.text(), checkbox2.text()); EXPECT_EQ(checkbox.fg_color(), checkbox2.fg_color()); EXPECT_EQ(checkbox.bg_color(), checkbox2.bg_color()); EXPECT_EQ(checkbox.selected(), checkbox2.selected()); -} \ No newline at end of file +} diff --git a/tools/simulators/test_sim.cpp b/tools/simulators/test_sim.cpp index 2298129..fa5ea91 100644 --- a/tools/simulators/test_sim.cpp +++ b/tools/simulators/test_sim.cpp @@ -4,7 +4,7 @@ Test_Sim::Test_Sim(QObject* parrent) : Simulator_base("Test_Sim", std::chrono::milliseconds(1000), parrent), m_button("Off", Color(Color::White), Color(Color::Red)), -m_combobox("Combobox", Color(Color::White), Color(Color::Black), {"Option 1", "Option 2", "Option 3"}, 0), +m_combobox(Color(Color::White), Color(Color::Black), {"Option 1", "Option 2", "Option 3"}, 0), m_label("Label", Color(Color::White), Color(Color::Black)), m_checkbox("Option 1", Color(Color::White), Color(Color::Black)), m_slider("Slider", Color(Color::White), Color(Color::Black), 0, 100, 0),