YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-01-28 20:14:13 +00:00
Code Issues Projects Releases Wiki Activity

fix open action

Browse Source
This commit is contained in:
yggverse 2024-11-10 13:28:26 +02:00
parent 0f23730669
commit 0010e5e138
1 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/app/browser/window/tab.rs
View File

@ -35,7 +35,7 @@ impl Tab {
let action = Rc::new(Action::new());
// Init empty HashMap index as no tabs appended yet
let index = Rc::new(RefCell::new(HashMap::new()));
let index: Rc<RefCell<HashMap<GString, Rc<Item>>>> = Rc::new(RefCell::new(HashMap::new()));
// Init context menu
let menu = Menu::new(window_action.clone());
@ -45,41 +45,6 @@ impl Tab {
// Init events
action.open().connect_activate({
let index = index.clone();
let gobject = widget.gobject().clone();
// Actions
let browser_action = browser_action.clone();
let window_action = window_action.clone();
let action = action.clone();
move |request| {
// Init new tab item
let item = Item::new_rc(
&gobject,
// Actions
browser_action.clone(),
window_action.clone(),
action.clone(),
// Options
gobject
.selected_page()
.map(|page| gobject.page_position(&page) + 1),
false,
false,
);
// Register dynamically created tab components in the HashMap index
index.borrow_mut().insert(item.id(), item.clone());
// Apply request
if let Some(value) = request {
item.set_page_navigation_request_text(value.as_str());
item.page_reload();
}
}
});
widget.gobject().connect_setup_menu({
let window_action = window_action.clone();
move |tab_view, tab_page| {
@ -130,6 +95,23 @@ impl Tab {
}
});
action.open().connect_activate({
let index = index.clone();
let widget = widget.clone();
move |request| {
if let Some(value) = request {
if let Some(page) = widget.page(None) {
if let Some(id) = page.keyword() {
if let Some(item) = index.borrow().get(&id) {
item.set_page_navigation_request_text(value.as_str());
item.page_reload();
}
}
}
}
}
});
// Return activated struct
Rc::new(Self {
browser_action,