mirror of
https://github.com/ByteAtATime/raycast-linux.git
synced 2025-12-23 10:11:57 +00:00
feat: make header input ignore navigation keys
This commit is contained in:
parent
6e355dc82b
commit
2a4e2b32e0
3 changed files with 153 additions and 1 deletions
145
src/components/key_filter.rs
Normal file
145
src/components/key_filter.rs
Normal file
|
|
@ -0,0 +1,145 @@
|
|||
use iced::advanced::layout::{self, Layout};
|
||||
use iced::advanced::renderer;
|
||||
use iced::advanced::widget::{self, Tree, Widget};
|
||||
use iced::keyboard::Key;
|
||||
use iced::{Element, Event, Length, Rectangle, Size, Vector, mouse};
|
||||
|
||||
pub struct KeyFilter<'a, Message, Theme, Renderer> {
|
||||
content: Element<'a, Message, Theme, Renderer>,
|
||||
keys: Vec<Key>,
|
||||
}
|
||||
|
||||
impl<'a, Message, Theme, Renderer> KeyFilter<'a, Message, Theme, Renderer> {
|
||||
pub fn new(content: impl Into<Element<'a, Message, Theme, Renderer>>) -> Self {
|
||||
Self {
|
||||
content: content.into(),
|
||||
keys: Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ignore(mut self, key: Key) -> Self {
|
||||
self.keys.push(key);
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer>
|
||||
for KeyFilter<'_, Message, Theme, Renderer>
|
||||
where
|
||||
Renderer: renderer::Renderer,
|
||||
{
|
||||
fn tag(&self) -> widget::tree::Tag {
|
||||
self.content.as_widget().tag()
|
||||
}
|
||||
|
||||
fn state(&self) -> widget::tree::State {
|
||||
self.content.as_widget().state()
|
||||
}
|
||||
|
||||
fn children(&self) -> Vec<Tree> {
|
||||
self.content.as_widget().children()
|
||||
}
|
||||
|
||||
fn diff(&self, tree: &mut Tree) {
|
||||
self.content.as_widget().diff(tree);
|
||||
}
|
||||
|
||||
fn size(&self) -> Size<Length> {
|
||||
self.content.as_widget().size()
|
||||
}
|
||||
|
||||
fn layout(
|
||||
&mut self,
|
||||
tree: &mut Tree,
|
||||
renderer: &Renderer,
|
||||
limits: &layout::Limits,
|
||||
) -> layout::Node {
|
||||
self.content.as_widget_mut().layout(tree, renderer, limits)
|
||||
}
|
||||
|
||||
fn draw(
|
||||
&self,
|
||||
tree: &Tree,
|
||||
renderer: &mut Renderer,
|
||||
theme: &Theme,
|
||||
style: &renderer::Style,
|
||||
layout: Layout<'_>,
|
||||
cursor: mouse::Cursor,
|
||||
viewport: &Rectangle,
|
||||
) {
|
||||
self.content
|
||||
.as_widget()
|
||||
.draw(tree, renderer, theme, style, layout, cursor, viewport);
|
||||
}
|
||||
|
||||
fn mouse_interaction(
|
||||
&self,
|
||||
tree: &Tree,
|
||||
layout: Layout<'_>,
|
||||
cursor: mouse::Cursor,
|
||||
viewport: &Rectangle,
|
||||
renderer: &Renderer,
|
||||
) -> mouse::Interaction {
|
||||
self.content
|
||||
.as_widget()
|
||||
.mouse_interaction(tree, layout, cursor, viewport, renderer)
|
||||
}
|
||||
|
||||
fn operate(
|
||||
&mut self,
|
||||
tree: &mut Tree,
|
||||
layout: Layout<'_>,
|
||||
renderer: &Renderer,
|
||||
operation: &mut dyn widget::Operation,
|
||||
) {
|
||||
self.content
|
||||
.as_widget_mut()
|
||||
.operate(tree, layout, renderer, operation);
|
||||
}
|
||||
|
||||
fn update(
|
||||
&mut self,
|
||||
tree: &mut Tree,
|
||||
event: &Event,
|
||||
layout: Layout<'_>,
|
||||
cursor: mouse::Cursor,
|
||||
renderer: &Renderer,
|
||||
clipboard: &mut dyn iced::advanced::Clipboard,
|
||||
shell: &mut iced::advanced::Shell<'_, Message>,
|
||||
viewport: &Rectangle,
|
||||
) {
|
||||
if let Event::Keyboard(iced::keyboard::Event::KeyPressed { key, .. }) = event {
|
||||
if self.keys.contains(key) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
self.content.as_widget_mut().update(
|
||||
tree, event, layout, cursor, renderer, clipboard, shell, viewport,
|
||||
)
|
||||
}
|
||||
|
||||
fn overlay<'b>(
|
||||
&'b mut self,
|
||||
tree: &'b mut Tree,
|
||||
layout: Layout<'b>,
|
||||
renderer: &Renderer,
|
||||
viewport: &Rectangle,
|
||||
translation: Vector,
|
||||
) -> Option<iced::advanced::overlay::Element<'b, Message, Theme, Renderer>> {
|
||||
self.content
|
||||
.as_widget_mut()
|
||||
.overlay(tree, layout, renderer, viewport, translation)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, Message, Theme, Renderer> From<KeyFilter<'a, Message, Theme, Renderer>>
|
||||
for Element<'a, Message, Theme, Renderer>
|
||||
where
|
||||
Message: 'a,
|
||||
Theme: 'a,
|
||||
Renderer: renderer::Renderer + 'a,
|
||||
{
|
||||
fn from(key_filter: KeyFilter<'a, Message, Theme, Renderer>) -> Self {
|
||||
Element::new(key_filter)
|
||||
}
|
||||
}
|
||||
|
|
@ -7,6 +7,7 @@ pub mod dropdown;
|
|||
pub mod footer;
|
||||
pub mod grid;
|
||||
pub mod kbd;
|
||||
pub mod key_filter;
|
||||
pub mod list;
|
||||
pub mod scrollable;
|
||||
pub mod types;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
use iced::keyboard::{Key, key::Named};
|
||||
use iced::widget::{column, container, pick_list, row, rule, stack, text_input};
|
||||
use iced::{Element, Length, Theme};
|
||||
|
||||
use crate::components::animator::Scaler;
|
||||
use crate::components::key_filter::KeyFilter;
|
||||
use crate::components::{
|
||||
action_panel::render_action_panel,
|
||||
dropdown::{Dropdown, DropdownChild},
|
||||
|
|
@ -91,7 +93,11 @@ fn render_search_bar(state: &State) -> Element<'_, Message> {
|
|||
}
|
||||
});
|
||||
|
||||
let mut row_content = row![text_input]
|
||||
let filtered_input = KeyFilter::new(text_input)
|
||||
.ignore(Key::Named(Named::ArrowLeft))
|
||||
.ignore(Key::Named(Named::ArrowRight));
|
||||
|
||||
let mut row_content = row![filtered_input]
|
||||
.align_y(iced::Alignment::Center)
|
||||
.height(Length::Fill);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue