remove action delegation

src/browser/main/tab/page.rs

@@ -25,7 +25,7 @@ pub struct Page {
     widget: Box,
     // Actions
     action_page_open: Arc<SimpleAction>,
-    // action_tab_page_navigation_reload: Arc<SimpleAction>,
+    action_tab_page_navigation_reload: Arc<SimpleAction>,
     action_update: Arc<SimpleAction>,
     // Components
     navigation: Arc<Navigation>,
@@ -83,6 +83,7 @@ impl Page {
         // Init events
         action_page_open.connect_activate({
             let navigation = navigation.clone();
+            let action_tab_page_navigation_reload = action_tab_page_navigation_reload.clone();
             move |_, request| {
                 // Convert to GString
                 let request = GString::from(
@@ -103,9 +104,10 @@ impl Page {
                 }
 
                 // Update
-                navigation.set_request_text(
+                navigation.set_request_text(&request);
-                    &request, true, // activate (page reload)
+
-                );
+                // Reload page
+                action_tab_page_navigation_reload.activate(None);
             }
         });
 
@@ -115,7 +117,7 @@ impl Page {
             widget,
             // Actions
             action_page_open,
-            // action_tab_page_navigation_reload,
+            action_tab_page_navigation_reload,
             action_update,
             // Components
             content,
@@ -139,19 +141,21 @@ impl Page {
 
     pub fn navigation_history_back(&self) {
         if let Some(request) = self.navigation.history_back(true) {
-            // Update without history record
+            // Update
-            self.navigation.set_request_text(
+            self.navigation.set_request_text(&request);
-                &request, true, // activate (page reload)
+
-            );
+            // Reload page
+            self.action_tab_page_navigation_reload.activate(None);
         }
     }
 
     pub fn navigation_history_forward(&self) {
         if let Some(request) = self.navigation.history_forward(true) {
-            // Update without history record
+            // Update
-            self.navigation.set_request_text(
+            self.navigation.set_request_text(&request);
-                &request, true, // activate (page reload)
+
-            );
+            // Reload page
+            self.action_tab_page_navigation_reload.activate(None);
         }
     }
 
@@ -423,10 +427,11 @@ impl Page {
                     // Make sure new request conversible to valid URI
                     match Uri::parse(&request_text, UriFlags::NONE) {
                         Ok(_) => {
-                            self.navigation.set_request_text(
+                            // Update
-                                &request_text,
+                            self.navigation.set_request_text(&request_text);
-                                true, // activate (page reload)
+
-                            );
+                            // Reload page
+                            self.action_tab_page_navigation_reload.activate(None);
                         }
                         Err(_) => {
                             // @TODO any action here?
@@ -434,13 +439,16 @@ impl Page {
                     }
                 } else {
                     // Plain text given, make search request to default provider
-                    self.navigation.set_request_text(
+                    let request_text = gformat!(
-                        &gformat!(
+                        "gemini://tlgs.one/search?{}",
-                            "gemini://tlgs.one/search?{}",
+                        Uri::escape_string(&request_text, None, false)
-                            Uri::escape_string(&request_text, None, false)
-                        ),
-                        true, // activate (page reload)
                     );
+
+                    // Update
+                    self.navigation.set_request_text(&request_text);
+
+                    // Reload page
+                    self.action_tab_page_navigation_reload.activate(None);
                 }
             }
         };

src/browser/main/tab/page/navigation.rs

@@ -110,13 +110,11 @@ impl Navigation {
     }
 
     // Setters
-    pub fn set_request_text(&self, value: &GString, activate: bool) {
+    pub fn set_request_text(&self, value: &GString) {
-        if activate {
+        // Focus out from content area on activate the link @TODO
-            // Focus out from content area on activate the link @TODO
+        self.widget.child_focus(DirectionType::Right);
-            self.widget.child_focus(DirectionType::Right);
-        }
 
-        self.request.set_text(value, activate);
+        self.request.set_text(value);
     }
 
     // Getters

src/browser/main/tab/page/navigation/request.rs

@@ -103,12 +103,8 @@ impl Request {
     }
 
     // Setters
-    pub fn set_text(&self, value: &GString, activate: bool) {
+    pub fn set_text(&self, value: &GString) {
         self.widget.set_text(value);
-
-        if activate {
-            self.widget.emit_activate();
-        }
     }
 
     // Getters