YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2026-04-01 17:15:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove Escape accels from window actions as blocking dialog windows, replace it with local EventControllerKey implementation, that depends of active focus

Browse source
This commit is contained in:
yggverse 2025-03-20 23:55:33 +02:00
parent 4a81297ef1
commit d469499d46
10 changed files with 37 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/app/browser/window/tab.rs
View file

@ -3,7 +3,7 @@ mod database;
mod item;
mod menu;
use super::{Action as WindowAction, BrowserAction, Position};
use super::{Action as WindowAction, Position};
use crate::Profile;
use action::Action;
use adw::{TabPage, TabView};
@ -17,7 +17,6 @@ use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc};
// Main
pub struct Tab {
browser_action: Rc<BrowserAction>,
window_action: Rc<WindowAction>,
profile: Arc<Profile>,
index: Rc<RefCell<HashMap<TabPage, Rc<Item>>>>,
@ -29,10 +28,7 @@ impl Tab {
// Constructors
/// Build new `Self`
pub fn build(
profile: &Arc<Profile>,
(browser_action, window_action): (&Rc<BrowserAction>, &Rc<WindowAction>),
) -> Self {
pub fn build(profile: &Arc<Profile>, window_action: &Rc<WindowAction>) -> Self {
let action = Rc::new(Action::new());
// Init empty HashMap index
@ -126,7 +122,6 @@ impl Tab {
// Return activated `Self`
Self {
profile: profile.clone(),
browser_action: browser_action.clone(),
window_action: window_action.clone(),
index,
tab_view,
@ -152,7 +147,7 @@ impl Tab {
(&tab_page, &target_child),
&self.profile,
// Actions
(&self.browser_action, &self.window_action, &self.action),
(&self.window_action, &self.action),
// Options
request,
is_load,
@ -216,13 +211,6 @@ impl Tab {
}
}
// Toggle escape action for specified or current item
pub fn escape(&self) {
if let Some(item) = self.item(None) {
item.page.escape();
}
}
// Toggle search widget
pub fn find(&self, page_position: Option<i32>) {
if let Some(item) = self.item(page_position) {
@ -317,7 +305,7 @@ impl Tab {
(&tab_page, &target_child),
&self.profile,
// Actions
(&self.browser_action, &self.window_action, &self.action),
(&self.window_action, &self.action),
// Options
None,
false,