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

remove extra conversion

Browse Source
This commit is contained in:
yggverse 2024-10-14 03:50:33 +03:00
parent 8f1e94dd68
commit 3047102c87
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/browser/window/tab/item/page.rs
View File

@ -59,6 +59,7 @@ impl Page {
action_tab_append.clone(), action_tab_append.clone(),
action_page_open.clone(), action_page_open.clone(),
)); ));
let navigation = Navigation::new_arc( let navigation = Navigation::new_arc(
action_tab_page_navigation_base.clone(), action_tab_page_navigation_base.clone(),
action_tab_page_navigation_history_back.clone(), action_tab_page_navigation_history_back.clone(),
@ -66,6 +67,7 @@ impl Page {
action_tab_page_navigation_reload.clone(), action_tab_page_navigation_reload.clone(),
action_update.clone(), action_update.clone(),
); );
let widget = Widget::new_arc( let widget = Widget::new_arc(
action_page_open.clone(), action_page_open.clone(),
&name, // ID &name, // ID
@ -81,17 +83,15 @@ impl Page {
let navigation = navigation.clone(); let navigation = navigation.clone();
let action_tab_page_navigation_reload = action_tab_page_navigation_reload.clone(); let action_tab_page_navigation_reload = action_tab_page_navigation_reload.clone();
move |_, request| { move |_, request| {
// Convert to GString // Update request
let request = GString::from( navigation.set_request_text(
request request
.expect("Parameter required for `page.open` action") .expect("Parameter required for `page.open` action")
.get::<String>() .get::<String>()
.expect("Parameter does not match `String`"), .expect("Parameter does not match `String`")
.as_str(),
); );
// Update
navigation.set_request_text(&request);
// Reload page // Reload page
action_tab_page_navigation_reload.activate(None); action_tab_page_navigation_reload.activate(None);
} }

2
src/app/browser/window/tab/item/page/navigation.rs
View File

@ -158,7 +158,7 @@ impl Navigation {
} }
// Setters // Setters
pub fn set_request_text(&self, value: &GString) { pub fn set_request_text(&self, value: &str) {
// Focus out from content area on activate the link @TODO // Focus out from content area on activate the link @TODO
self.widget.focus(); self.widget.focus();

2
src/app/browser/window/tab/item/page/navigation/request.rs
View File

@ -94,7 +94,7 @@ impl Request {
} }
// Setters // Setters
pub fn set_text(&self, value: &GString) { pub fn set_text(&self, value: &str) {
self.widget.set_text(value); self.widget.set_text(value);
} }

2
src/app/browser/window/tab/item/page/navigation/request/widget.rs
View File

@ -181,7 +181,7 @@ impl Widget {
} }
// Setters // Setters
pub fn set_text(&self, value: &GString) { pub fn set_text(&self, value: &str) {
self.gobject.set_text(value); self.gobject.set_text(value);
} }