diff --git a/src/app/browser/window/header/bar/menu.rs b/src/app/browser/window/header/bar/menu.rs index d09ffe6f..a63668f8 100644 --- a/src/app/browser/window/header/bar/menu.rs +++ b/src/app/browser/window/header/bar/menu.rs @@ -9,10 +9,6 @@ use std::rc::Rc; // Config options const LABEL_MAX_LENGTH: usize = 32; -const RECENT_BOOKMARKS: usize = 50; -const RECENTLY_CLOSED: usize = 50; -const RECENT_REQUESTS: usize = 50; - pub struct Menu { pub menu_button: MenuButton, } @@ -195,7 +191,7 @@ impl Menu { move |_| { // Bookmarks main_bookmarks.remove_all(); - for request in profile.bookmark.memory.recent(RECENT_BOOKMARKS) { + for request in profile.bookmark.memory.recent() { let menu_item = gio::MenuItem::new(Some(&label(&request, LABEL_MAX_LENGTH)), None); menu_item.set_action_and_target_value(Some(&format!( "{}.{}", @@ -212,7 +208,7 @@ impl Menu { // Recently closed history main_history_tab.remove_all(); - for item in profile.history.memory.tab.recent(RECENTLY_CLOSED) { + for item in profile.history.memory.tab.recent() { let item_request = item.page.navigation.request.widget.entry.text(); // @TODO restore entire `Item` let menu_item = gio::MenuItem::new(Some(&label(&item_request, LABEL_MAX_LENGTH)), None); menu_item.set_action_and_target_value(Some(&format!( @@ -226,7 +222,7 @@ impl Menu { // Recently visited history main_history_request.remove_all(); - for request in profile.history.memory.request.recent(RECENT_REQUESTS) { + for request in profile.history.memory.request.recent() { let menu_item = gio::MenuItem::new(Some(&label(&request, LABEL_MAX_LENGTH)), None); menu_item.set_action_and_target_value(Some(&format!( "{}.{}", diff --git a/src/profile/bookmark/memory.rs b/src/profile/bookmark/memory.rs index 2111cb93..e72f37a8 100644 --- a/src/profile/bookmark/memory.rs +++ b/src/profile/bookmark/memory.rs @@ -63,14 +63,13 @@ impl Memory { } /// Get recent requests vector sorted by `ID` DESC - pub fn recent(&self, limit: usize) -> Vec { + pub fn recent(&self) -> Vec { let mut recent: Vec = Vec::new(); for (request, _) in self .index .borrow() .iter() .sorted_by(|a, b| Ord::cmp(&b.1, &a.1)) - .take(limit) { recent.push(request.to_string()) } diff --git a/src/profile/history/memory/request.rs b/src/profile/history/memory/request.rs index 138957f1..2537f1a7 100644 --- a/src/profile/history/memory/request.rs +++ b/src/profile/history/memory/request.rs @@ -39,14 +39,13 @@ impl Request { /// Get recent requests vector /// * sorted by `unix_timestamp` DESC - pub fn recent(&self, limit: usize) -> Vec { + pub fn recent(&self) -> Vec { let mut recent: Vec = Vec::new(); for (request, _) in self .index .borrow() .iter() .sorted_by(|a, b| Ord::cmp(&b.1.unix_timestamp, &a.1.unix_timestamp)) - .take(limit) { recent.push(request.clone()) } diff --git a/src/profile/history/memory/tab.rs b/src/profile/history/memory/tab.rs index c3111dfb..ad30ff56 100644 --- a/src/profile/history/memory/tab.rs +++ b/src/profile/history/memory/tab.rs @@ -39,15 +39,14 @@ impl Tab { }); } - /// Get recent `Item` vector sorted by time DESC - pub fn recent(&self, limit: usize) -> Vec> { + /// Get recent `Item` vector sorted by `unix_timestamp` DESC + pub fn recent(&self) -> Vec> { let mut recent: Vec> = Vec::new(); for record in self .index .borrow() .iter() .sorted_by(|a, b| Ord::cmp(&b.unix_timestamp, &a.unix_timestamp)) - .take(limit) { recent.push(record.item.clone()) }