YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2026-03-31 16:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change update_secondary_icon arguments, enshort local var names

Browse source
This commit is contained in:
yggverse 2025-03-21 23:06:55 +02:00
parent 922ddd00c4
commit 71ae92cfaa
1 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/app/browser/window/tab/item/page/navigation/request.rs
View file

@ -91,60 +91,62 @@ impl Request {
}); });
entry.connect_icon_release({ entry.connect_icon_release({
let profile = profile.clone(); let p = profile.clone();
move |this, position| match position { move |e, position| match position {
EntryIconPosition::Primary => { EntryIconPosition::Primary => {
if matches!(primary_icon::from(&this.text()), PrimaryIcon::Search { .. }) { if matches!(primary_icon::from(&e.text()), PrimaryIcon::Search { .. }) {
show_search_dialog(this, &profile) show_search_dialog(e, &p)
} else { } else {
show_identity_dialog(this, &profile) show_identity_dialog(e, &p)
} }
} }
EntryIconPosition::Secondary => this.emit_activate(), EntryIconPosition::Secondary => e.emit_activate(),
_ => todo!(), // unexpected _ => todo!(), // unexpected
} }
}); });
entry.connect_has_focus_notify(|this| update_secondary_icon(this, false)); entry.connect_has_focus_notify({
let i = info.clone();
move |e| update_secondary_icon(e, &i.borrow())
});
suggestion suggestion
.signal_handler_id .signal_handler_id
.borrow_mut() .borrow_mut()
.replace(entry.connect_changed({ .replace(entry.connect_changed({
let profile = profile.clone(); let a = item_action.clone();
let item_action = item_action.clone(); let i = info.clone();
let suggestion = suggestion.clone(); let p = profile.clone();
move |this| { let s = suggestion.clone();
move |e| {
// Update actions // Update actions
item_action.reload.set_enabled(!this.text().is_empty()); a.reload.set_enabled(!e.text().is_empty());
item_action.home.set_enabled(home(this).is_some()); a.home.set_enabled(home(e).is_some());
// Update icons // Update icons
update_primary_icon(this, &profile); update_primary_icon(e, &p);
update_secondary_icon(this, false); update_secondary_icon(e, &i.borrow());
// Show search suggestions // Show search suggestions
if this.focus_child().is_some() { if e.focus_child().is_some() {
suggestion.update(Some(50)); // @TODO optional s.update(Some(50)); // @TODO optional
} }
} }
})); // `suggestion` wants `signal_handler_id` to block this event on autocomplete navigation })); // `suggestion` wants `signal_handler_id` to block this event on autocomplete navigation
entry.connect_activate({ entry.connect_activate({
let item_action = item_action.clone(); let a = item_action.clone();
let suggestion = suggestion.clone(); let s = suggestion.clone();
move |_| { move |_| {
use gtk::prelude::ActionExt; use gtk::prelude::ActionExt;
item_action.reload.activate(None); a.reload.activate(None);
suggestion.hide(); s.hide();
} }
}); });
entry.connect_has_focus_notify({ entry.connect_has_focus_notify({
let suggestion = suggestion.clone(); let s = suggestion.clone();
move |_| { move |_| {
if suggestion.is_visible() { if s.is_visible() {
suggestion.hide() s.hide()
} }
} }
}); });
@ -336,12 +338,12 @@ fn is_focused(entry: &Entry) -> bool {
/// Secondary icon has two modes: /// Secondary icon has two modes:
/// * navigate to the location button (on the entry is focused / has edit mode) /// * navigate to the location button (on the entry is focused / has edit mode)
/// * page info button with dialog window activation (on the entry is inactive) /// * page info button with dialog window activation (on the entry is inactive)
fn update_secondary_icon(entry: &Entry, has_info: bool) { fn update_secondary_icon(entry: &Entry, info: &Info) {
if is_focused(entry) { if is_focused(entry) {
entry.set_secondary_icon_name(Some("pan-end-symbolic")); entry.set_secondary_icon_name(Some("pan-end-symbolic"));
entry.set_secondary_icon_tooltip_text(Some("Go to the location")) entry.set_secondary_icon_tooltip_text(Some("Go to the location"))
} else { } else {
if has_info { if !info.is_deprecated() && info.matches(&entry.text()) {
entry.set_secondary_icon_name(Some("help-about-symbolic")); entry.set_secondary_icon_name(Some("help-about-symbolic"));
entry.set_secondary_icon_tooltip_text(Some("Page info")); entry.set_secondary_icon_tooltip_text(Some("Page info"));
} else { } else {