YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2026-04-02 09:35: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

14
src/app/browser/window/tab/item/page.rs
View file

@ -5,10 +5,11 @@ mod input;
mod navigation;
mod search;
use super::{Action as ItemAction, BrowserAction, Profile, TabAction, WindowAction};
use super::{Action as ItemAction, Profile, TabAction, WindowAction};
use adw::TabPage;
use anyhow::Result;
use content::Content;
use gtk::prelude::WidgetExt;
use info::Info;
use input::Input;
use navigation::Navigation;
@ -19,7 +20,6 @@ use std::{cell::RefCell, rc::Rc, sync::Arc};
pub struct Page {
pub profile: Arc<Profile>,
// Actions
pub browser_action: Rc<BrowserAction>,
pub item_action: Rc<ItemAction>,
pub window_action: Rc<WindowAction>,
// Components
@ -42,8 +42,7 @@ impl Page {
pub fn build(
profile: &Arc<Profile>,
(browser_action, window_action, tab_action, item_action): (
&Rc<BrowserAction>,
(window_action, tab_action, item_action): (
&Rc<WindowAction>,
&Rc<TabAction>,
&Rc<ItemAction>,
@ -65,7 +64,6 @@ impl Page {
profile: profile.clone(),
tab_page: tab_page.clone(),
// Actions
browser_action: browser_action.clone(),
item_action: item_action.clone(),
window_action: window_action.clone(),
// Components
@ -86,8 +84,14 @@ impl Page {
/// Request `Escape` action for all page components
pub fn escape(&self) {
use gtk::prelude::RootExt;
self.search.hide();
self.navigation.escape();
self.content
.g_box
.root()
.unwrap()
.set_focus(gtk::Window::NONE);
}
/// Toggle `Find` widget