RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 07:27:45 +00:00
Code Issues Activity Actions

Browser: Have BookmarksBarWidget signal bookmark changes for Tab

Browse source 
This fixes an issue with a tab not updating its bookmark button when
we either edit or delete a bookmark and the tab happens to be on the
same page associated with the bookmark URL. `BookmarksBarWidget`
"signals" a `Tab` object of any bookmark changes, where it will
update the bookmark button depending on if the current URL is an
existing bookmark or not.
This commit is contained in:
Kemal Zebari 2023-03-29 19:36:57 -07:00 • committed by Andrew Kaster
parent 86781f0c08
commit 0060b8c4e5
3 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Applications/Browser/BookmarksBarWidget.cpp
View file

@ -292,10 +292,15 @@ bool BookmarksBarWidget::remove_bookmark(DeprecatedString const& url)
auto& json_model = *static_cast<GUI::JsonArrayModel*>(model());
auto const item_removed = json_model.remove(item_index);
if (item_removed)
json_model.store();
if (!item_removed)
return false;
return item_removed;
json_model.store();
if (on_bookmark_change)
on_bookmark_change();
return true;
}
}
@ -315,8 +320,8 @@ bool BookmarksBarWidget::add_bookmark(DeprecatedString const& url, DeprecatedStr
if (!was_bookmark_added)
return false;
if (on_bookmark_add)
on_bookmark_add(url);
if (on_bookmark_change)
on_bookmark_change();
if (edit_bookmark(url, PerformEditOn::NewBookmark))
return true;
@ -333,9 +338,14 @@ bool BookmarksBarWidget::edit_bookmark(DeprecatedString const& url, PerformEditO
if (item_url == url) {
auto values = BookmarkEditor::edit_bookmark(window(), item_title, item_url, perform_edit_on);
return update_model(values, [item_index](auto& model, auto&& values) {
auto was_bookmark_changed = update_model(values, [item_index](auto& model, auto&& values) {
return model.set(item_index, move(values));
});
if (was_bookmark_changed && on_bookmark_change)
on_bookmark_change();
return was_bookmark_changed;
}
}