LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-10 13:00:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibGUI/AbstractView: Remove on_selection

Browse Source 
Since the introduction of multi-select, we have had both `on_selection`
and `on_selection_change`, the latter of which was only invoked when a
change in selection came in through the model.

This removes `AbstractView::on_selection` and replaces it usage with
the more explicit `on_selection_change` everywhere.
This commit is contained in:
Jelle Raaijmakers 2021-05-25 22:48:43 +02:00 committed by Ali Mohammad Pur
parent ebe38639bc
commit 2c772d1848
Notes: sideshowbarker 2024-07-18 17:21:50 +09:00 
Author: https://github.com/gmta
Commit: https://github.com/SerenityOS/serenity/commit/2c772d18488
Pull-request: https://github.com/SerenityOS/serenity/pull/7468
Reviewed-by: https://github.com/alimpfard
12 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Userland/Applications/Browser/InspectorWidget.cpp
View File

@ -41,13 +41,15 @@ InspectorWidget::InspectorWidget()
auto& top_tab_widget = splitter.add<GUI::TabWidget>();
m_dom_tree_view = top_tab_widget.add_tab<GUI::TreeView>("DOM");
m_dom_tree_view->on_selection = [this](auto& index) {
m_dom_tree_view->on_selection_change = [this] {
const auto& index = m_dom_tree_view->selection().first();
auto* node = static_cast<Web::DOM::Node*>(index.internal_data());
set_inspected_node(node);
};
m_layout_tree_view = top_tab_widget.add_tab<GUI::TreeView>("Layout");
m_layout_tree_view->on_selection = [this](auto& index) {
m_layout_tree_view->on_selection_change = [this] {
const auto& index = m_layout_tree_view->selection().first();
auto* node = static_cast<Web::Layout::Node*>(index.internal_data());
set_inspected_node(node->dom_node());
};

3
Userland/Applications/FileManager/main.cpp
View File

@ -1049,7 +1049,8 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
}
};
tree_view.on_selection = [&](const GUI::ModelIndex& index) {
tree_view.on_selection_change = [&] {
const auto& index = tree_view.selection().first();
if (directories_model->m_previously_selected_index.is_valid())
directories_model->update_node_on_selection(directories_model->m_previously_selected_index, false);

15
Userland/Applications/Help/main.cpp
View File

@ -179,24 +179,25 @@ int main(int argc, char* argv[])
GUI::MessageBox::Type::Error);
}
};
search_list_view.on_selection = [&](auto index) {
search_list_view.on_selection_change = [&] {
const auto& index = search_list_view.selection().first();
if (!index.is_valid())
return;
if (auto model = search_list_view.model()) {
auto& search_model = *static_cast<GUI::FilteringProxyModel*>(model);
index = search_model.map(index);
} else {
auto view_model = search_list_view.model();
if (!view_model) {
page_view.load_empty_document();
return;
}
String path = model->page_path(index);
auto& search_model = *static_cast<GUI::FilteringProxyModel*>(view_model);
const auto& mapped_index = search_model.map(index);
String path = model->page_path(mapped_index);
if (path.is_null()) {
page_view.load_empty_document();
return;
}
tree_view.selection().clear();
tree_view.selection().add(index);
tree_view.selection().add(mapped_index);
history.push(path);
update_actions();
open_page(path);

3
Userland/Applications/Spreadsheet/CellTypeDialog.cpp
View File

@ -141,7 +141,8 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, const Vector<Position>& po
auto& type_list = left_side.add<GUI::ListView>();
type_list.set_model(*GUI::ItemListModel<String>::create(g_types));
type_list.set_should_hide_unnecessary_scrollbars(true);
type_list.on_selection = [&](auto& index) {
type_list.on_selection_change = [&] {
const auto& index = type_list.selection().first();
if (!index.is_valid()) {
m_type = nullptr;
return;

3
Userland/DevTools/HackStudio/ClassViewWidget.cpp
View File

@ -19,7 +19,8 @@ ClassViewWidget::ClassViewWidget()
set_layout<GUI::VerticalBoxLayout>();
m_class_tree = add<GUI::TreeView>();
m_class_tree->on_selection = [this](auto& index) {
m_class_tree->on_selection_change = [this] {
const auto& index = m_class_tree->selection().first();
if (!index.is_valid())
return;

3
Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp
View File

@ -65,7 +65,8 @@ DebugInfoWidget::DebugInfoWidget()
variables_tab_widget.add_widget("Variables", build_variables_tab());
variables_tab_widget.add_widget("Registers", build_registers_tab());
m_backtrace_view->on_selection = [this](auto& index) {
m_backtrace_view->on_selection_change = [this] {
const auto& index = m_backtrace_view->selection().first();
auto& model = static_cast<BacktraceModel&>(*m_backtrace_view->model());
// Note: The reconstruction of the register set here is obviously incomplete.

3
Userland/DevTools/HackStudio/Git/GitWidget.cpp
View File

@ -44,7 +44,8 @@ GitWidget::GitWidget(const LexicalPath& repo_root)
m_unstaged_files = unstaged.add<GitFilesView>(
[this](const auto& file) { stage_file(file); },
Gfx::Bitmap::load_from_file("/res/icons/16x16/plus.png").release_nonnull());
m_unstaged_files->on_selection = [this](const GUI::ModelIndex& index) {
m_unstaged_files->on_selection_change = [this] {
const auto& index = m_unstaged_files->selection().first();
const auto& selected = index.data().as_string();
show_diff(LexicalPath(selected));
};

6
Userland/DevTools/Profiler/main.cpp
View File

@ -143,7 +143,8 @@ int main(int argc, char** argv)
auto& disassembly_view = bottom_splitter.add<GUI::TableView>();
disassembly_view.set_visible(false);
tree_view.on_selection = [&](auto& index) {
tree_view.on_selection_change = [&] {
const auto& index = tree_view.selection().first();
profile->set_disassembly_index(index);
disassembly_view.set_model(profile->disassembly_model());
};
@ -161,7 +162,8 @@ int main(int argc, char** argv)
samples_table_view.set_model(profile->samples_model());
auto& individual_sample_view = samples_splitter.add<GUI::TableView>();
samples_table_view.on_selection = [&](const GUI::ModelIndex& index) {
samples_table_view.on_selection_change = [&] {
const auto& index = samples_table_view.selection().first();
auto model = IndividualSampleModel::create(*profile, index.data(GUI::ModelRole::Custom).to_integer<size_t>());
individual_sample_view.set_model(move(model));
};

6
Userland/Libraries/LibGUI/AbstractView.cpp
View File

@ -110,8 +110,8 @@ void AbstractView::did_update_selection()
{
if (!model() || selection().first() != m_edit_index)
stop_editing();
if (model() && on_selection && selection().first().is_valid())
on_selection(selection().first());
if (model() && on_selection_change)
on_selection_change();
}
void AbstractView::did_scroll()
@ -194,8 +194,6 @@ void AbstractView::activate_selected()
void AbstractView::notify_selection_changed(Badge<ModelSelection>)
{
did_update_selection();
if (on_selection_change)
on_selection_change();
if (!m_suppress_update_on_selection_change)
update();
}

1
Userland/Libraries/LibGUI/AbstractView.h
View File

@ -98,7 +98,6 @@ public:
Function<void()> on_selection_change;
Function<void(const ModelIndex&)> on_activation;
Function<void(const ModelIndex&)> on_selection;
Function<void(const ModelIndex&, const ContextMenuEvent&)> on_context_menu_request;
Function<void(const ModelIndex&, const DropEvent&)> on_drop;

3
Userland/Libraries/LibGUI/ComboBox.cpp
View File

@ -101,8 +101,9 @@ ComboBox::ComboBox()
m_list_view->set_hover_highlighting(true);
m_list_view->set_frame_thickness(1);
m_list_view->set_frame_shadow(Gfx::FrameShadow::Plain);
m_list_view->on_selection = [this](auto& index) {
m_list_view->on_selection_change = [this] {
VERIFY(model());
const auto& index = m_list_view->selection().first();
m_list_view->set_activates_on_selection(true);
if (m_updating_model)
selection_updated(index);

9
Userland/Libraries/LibGUI/FontPicker.cpp
View File

@ -56,7 +56,8 @@ FontPicker::FontPicker(Window* parent_window, const Gfx::Font* current_font, boo
});
quick_sort(m_families);
m_family_list_view->on_selection = [this](auto& index) {
m_family_list_view->on_selection_change = [this] {
const auto& index = m_family_list_view->selection().first();
m_family = index.data().to_string();
m_weights.clear();
Gfx::FontDatabase::the().for_each_typeface([&](auto& typeface) {
@ -76,7 +77,8 @@ FontPicker::FontPicker(Window* parent_window, const Gfx::Font* current_font, boo
update_font();
};
m_weight_list_view->on_selection = [this](auto& index) {
m_weight_list_view->on_selection_change = [this] {
const auto& index = m_weight_list_view->selection().first();
bool font_is_fixed_size = false;
m_weight = index.data(ModelRole::Custom).to_i32();
m_sizes.clear();
@ -130,7 +132,8 @@ FontPicker::FontPicker(Window* parent_window, const Gfx::Font* current_font, boo
update_font();
};
m_size_list_view->on_selection = [this](auto& index) {
m_size_list_view->on_selection_change = [this] {
const auto& index = m_size_list_view->selection().first();
m_size = index.data().to_i32();
m_size_spin_box->set_value(m_size.value());
update_font();