LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 09:49:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibGUI: Unify naming of searching timer related members

Browse Source
This commit is contained in:
Dawid Wolosowicz 2021-09-04 15:05:41 +02:00 committed by Ali Mohammad Pur
parent 9225b45c2d
commit b775b1c199
Notes: sideshowbarker 2024-07-18 04:26:46 +09:00 
Author: https://github.com/d1823
Commit: https://github.com/SerenityOS/serenity/commit/b775b1c1995
Pull-request: https://github.com/SerenityOS/serenity/pull/9790
Reviewed-by: https://github.com/alimpfard ✅
Reviewed-by: https://github.com/kleinesfilmroellchen ✅
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,8 +30,8 @@ AbstractView::AbstractView()
AbstractView::~AbstractView() AbstractView::~AbstractView()
{ {
if (m_searching_timer) if (m_highlighted_search_timer)
m_searching_timer->stop(); m_highlighted_search_timer->stop();
if (m_model) if (m_model)
m_model->unregister_view({}, *this); m_model->unregister_view({}, *this);
} }
@ -435,12 +435,12 @@ void AbstractView::set_cursor(ModelIndex index, SelectionUpdate selection_update
{ {
if (!model() || !index.is_valid() || selection_mode() == SelectionMode::NoSelection) { if (!model() || !index.is_valid() || selection_mode() == SelectionMode::NoSelection) {
m_cursor_index = {}; m_cursor_index = {};
cancel_searching(); stop_highlighted_search_timer();
return; return;
} }
if (!m_cursor_index.is_valid() || model()->parent_index(m_cursor_index) != model()->parent_index(index)) if (!m_cursor_index.is_valid() || model()->parent_index(m_cursor_index) != model()->parent_index(index))
cancel_searching(); stop_highlighted_search_timer();
if (selection_mode() == SelectionMode::SingleSelection && (selection_update == SelectionUpdate::Ctrl || selection_update == SelectionUpdate::Shift)) if (selection_mode() == SelectionMode::SingleSelection && (selection_update == SelectionUpdate::Ctrl || selection_update == SelectionUpdate::Shift))
selection_update = SelectionUpdate::Set; selection_update = SelectionUpdate::Set;
@ -578,9 +578,9 @@ void AbstractView::keydown_event(KeyEvent& event)
sb.append_code_point(*it); sb.append_code_point(*it);
} }
do_search(sb.to_string()); do_search(sb.to_string());
start_searching_timer(); start_highlighted_search_timer();
} else { } else {
cancel_searching(); stop_highlighted_search_timer();
} }
event.accept(); event.accept();
@ -588,7 +588,7 @@ void AbstractView::keydown_event(KeyEvent& event)
} }
} else if (event.key() == KeyCode::Key_Escape) { } else if (event.key() == KeyCode::Key_Escape) {
if (is_searching()) { if (is_searching()) {
cancel_searching(); stop_highlighted_search_timer();
event.accept(); event.accept();
return; return;
@ -598,7 +598,7 @@ void AbstractView::keydown_event(KeyEvent& event)
sb.append(m_highlighted_search); sb.append(m_highlighted_search);
sb.append_code_point(event.code_point()); sb.append_code_point(event.code_point());
do_search(sb.to_string()); do_search(sb.to_string());
start_searching_timer(); start_highlighted_search_timer();
event.accept(); event.accept();
return; return;
@ -608,34 +608,34 @@ void AbstractView::keydown_event(KeyEvent& event)
AbstractScrollableWidget::keydown_event(event); AbstractScrollableWidget::keydown_event(event);
} }
void AbstractView::cancel_searching() void AbstractView::stop_highlighted_search_timer()
{ {
m_highlighted_search = nullptr; m_highlighted_search = nullptr;
if (m_searching_timer) if (m_highlighted_search_timer)
m_searching_timer->stop(); m_highlighted_search_timer->stop();
if (m_highlighted_search_index.is_valid()) { if (m_highlighted_search_index.is_valid()) {
m_highlighted_search_index = {}; m_highlighted_search_index = {};
update(); update();
} }
} }
void AbstractView::start_searching_timer() void AbstractView::start_highlighted_search_timer()
{ {
if (!m_searching_timer) { if (!m_highlighted_search_timer) {
m_searching_timer = add<Core::Timer>(); m_highlighted_search_timer = add<Core::Timer>();
m_searching_timer->set_single_shot(true); m_highlighted_search_timer->set_single_shot(true);
m_searching_timer->on_timeout = [this] { m_highlighted_search_timer->on_timeout = [this] {
cancel_searching(); stop_highlighted_search_timer();
}; };
} }
m_searching_timer->set_interval(5 * 1000); m_highlighted_search_timer->set_interval(5 * 1000);
m_searching_timer->restart(); m_highlighted_search_timer->restart();
} }
void AbstractView::do_search(String&& searching) void AbstractView::do_search(String&& searching)
{ {
if (searching.is_empty() || !model()) { if (searching.is_empty() || !model()) {
cancel_searching(); stop_highlighted_search_timer();
return; return;
} }
@ -663,7 +663,7 @@ void AbstractView::set_searchable(bool searchable)
return; return;
m_searchable = searchable; m_searchable = searchable;
if (!m_searchable) if (!m_searchable)
cancel_searching(); stop_highlighted_search_timer();
} }
void AbstractView::draw_item_text(Gfx::Painter& painter, const ModelIndex& index, bool is_selected, const Gfx::IntRect& text_rect, const StringView& item_text, const Gfx::Font& font, Gfx::TextAlignment alignment, Gfx::TextElision elision, size_t search_highlighting_offset) void AbstractView::draw_item_text(Gfx::Painter& painter, const ModelIndex& index, bool is_selected, const Gfx::IntRect& text_rect, const StringView& item_text, const Gfx::Font& font, Gfx::TextAlignment alignment, Gfx::TextElision elision, size_t search_highlighting_offset)

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

@ -163,8 +163,8 @@ protected:
void update_edit_widget_position(); void update_edit_widget_position();
bool is_searching() const { return !m_highlighted_search.is_null(); } bool is_searching() const { return !m_highlighted_search.is_null(); }
void cancel_searching(); void stop_highlighted_search_timer();
void start_searching_timer(); void start_highlighted_search_timer();
void do_search(String&&); void do_search(String&&);
ModelIndex drop_candidate_index() const { return m_drop_candidate_index; } ModelIndex drop_candidate_index() const { return m_drop_candidate_index; }
@ -193,7 +193,7 @@ private:
RefPtr<Model> m_model; RefPtr<Model> m_model;
ModelSelection m_selection; ModelSelection m_selection;
String m_highlighted_search; String m_highlighted_search;
RefPtr<Core::Timer> m_searching_timer; RefPtr<Core::Timer> m_highlighted_search_timer;
SelectionBehavior m_selection_behavior { SelectionBehavior::SelectItems }; SelectionBehavior m_selection_behavior { SelectionBehavior::SelectItems };
SelectionMode m_selection_mode { SelectionMode::SingleSelection }; SelectionMode m_selection_mode { SelectionMode::SingleSelection };
unsigned m_edit_triggers { EditTrigger::DoubleClicked | EditTrigger::EditKeyPressed }; unsigned m_edit_triggers { EditTrigger::DoubleClicked | EditTrigger::EditKeyPressed };