From ffff150435da4bb39b557042dd54ef02a043f40d Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 5 Aug 2019 18:32:04 +0200 Subject: [PATCH] LibGUI: Allow specifying the model column for GListView and GComboBox These widgets can only display a single column from the underlying data model, and it was previously hard-coded to use column 0. Now you can use any column you like. --- Libraries/LibGUI/GComboBox.h | 3 +++ Libraries/LibGUI/GListView.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Libraries/LibGUI/GComboBox.h b/Libraries/LibGUI/GComboBox.h index 017e538107..b243b0b8c9 100644 --- a/Libraries/LibGUI/GComboBox.h +++ b/Libraries/LibGUI/GComboBox.h @@ -26,6 +26,9 @@ public: bool only_allow_values_from_model() const { return m_only_allow_values_from_model; } void set_only_allow_values_from_model(bool); + int model_column() const { return m_list_view->model_column(); } + void set_model_column(int column) { m_list_view->set_model_column(column); } + Function on_change; Function on_return_pressed; diff --git a/Libraries/LibGUI/GListView.h b/Libraries/LibGUI/GListView.h index 1298ad4ec5..488cf319aa 100644 --- a/Libraries/LibGUI/GListView.h +++ b/Libraries/LibGUI/GListView.h @@ -27,6 +27,9 @@ public: virtual Rect content_rect(const GModelIndex&) const override; + int model_column() const { return m_model_column; } + void set_model_column(int column) { m_model_column = column; } + private: virtual void did_update_model() override; virtual void paint_event(GPaintEvent&) override;