-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use custom
opaque wrapper instead of the button-based "overlay" ele…
…ment in the stack to block mouse events for elements under a dialog; Implement esc_handler to handle Esc presses in dialogs; Minor visual improvements;
- Loading branch information
1 parent
eff8579
commit 6881ba4
Showing
5 changed files
with
415 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| // Copyright (c) 2025 RBB S.r.l | ||
| // [email protected] | ||
| // SPDX-License-Identifier: MIT | ||
| // Licensed under the MIT License; | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://github.com/mintlayer/mintlayer-core/blob/master/LICENSE | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use iced::{ | ||
| advanced::{ | ||
| layout, renderer, | ||
| widget::{tree, Operation, Tree}, | ||
| Clipboard, Layout, Shell, Widget, | ||
| }, | ||
| event, keyboard, | ||
| mouse::{self}, | ||
| overlay, Element, Event, Length, Rectangle, Size, Vector, | ||
| }; | ||
|
|
||
| /// Wrap an element, capturing Esc key press events and optionally emitting the specified message | ||
| /// on each key press. | ||
| /// | ||
| /// Note: the Esc key press events will be consumed even if msg_to_emit is None. | ||
| pub fn esc_handler<'a, Message, Theme, Renderer>( | ||
| content: impl Into<Element<'a, Message, Theme, Renderer>>, | ||
| msg_to_emit: Option<Message>, | ||
| ) -> Element<'a, Message, Theme, Renderer> | ||
| where | ||
| Message: Clone + 'a, | ||
| Theme: 'a, | ||
| Renderer: iced::advanced::Renderer + 'a, | ||
| { | ||
| Element::new(EscHandler { | ||
| content: content.into(), | ||
| msg_to_emit, | ||
| }) | ||
| } | ||
|
|
||
| struct EscHandler<'a, Message, Theme, Renderer> { | ||
| content: Element<'a, Message, Theme, Renderer>, | ||
| msg_to_emit: Option<Message>, | ||
| } | ||
|
|
||
| impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> | ||
| for EscHandler<'_, Message, Theme, Renderer> | ||
| where | ||
| Renderer: iced::advanced::Renderer, | ||
| Message: Clone, | ||
| { | ||
| fn tag(&self) -> tree::Tag { | ||
| self.content.as_widget().tag() | ||
| } | ||
|
|
||
| fn state(&self) -> 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 size_hint(&self) -> Size<Length> { | ||
| self.content.as_widget().size_hint() | ||
| } | ||
|
|
||
| fn layout( | ||
| &self, | ||
| tree: &mut Tree, | ||
| renderer: &Renderer, | ||
| limits: &layout::Limits, | ||
| ) -> layout::Node { | ||
| self.content.as_widget().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 operate( | ||
| &self, | ||
| state: &mut Tree, | ||
| layout: Layout<'_>, | ||
| renderer: &Renderer, | ||
| operation: &mut dyn Operation, | ||
| ) { | ||
| self.content.as_widget().operate(state, layout, renderer, operation); | ||
| } | ||
|
|
||
| fn on_event( | ||
| &mut self, | ||
| state: &mut Tree, | ||
| event: Event, | ||
| layout: Layout<'_>, | ||
| cursor: mouse::Cursor, | ||
| renderer: &Renderer, | ||
| clipboard: &mut dyn Clipboard, | ||
| shell: &mut Shell<'_, Message>, | ||
| viewport: &Rectangle, | ||
| ) -> event::Status { | ||
| let event_captured = match &event { | ||
| Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => { | ||
| if *key == keyboard::Key::Named(keyboard::key::Named::Escape) { | ||
| if let Some(msg) = &self.msg_to_emit { | ||
| shell.publish(msg.clone()); | ||
| } | ||
|
|
||
| true | ||
| } else { | ||
| false | ||
| } | ||
| } | ||
| _ => false, | ||
| }; | ||
|
|
||
| if event_captured { | ||
| event::Status::Captured | ||
| } else { | ||
| self.content.as_widget_mut().on_event( | ||
| state, event, layout, cursor, renderer, clipboard, shell, viewport, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| fn mouse_interaction( | ||
| &self, | ||
| state: &Tree, | ||
| layout: Layout<'_>, | ||
| cursor: mouse::Cursor, | ||
| viewport: &Rectangle, | ||
| renderer: &Renderer, | ||
| ) -> mouse::Interaction { | ||
| self.content | ||
| .as_widget() | ||
| .mouse_interaction(state, layout, cursor, viewport, renderer) | ||
| } | ||
|
|
||
| fn overlay<'b>( | ||
| &'b mut self, | ||
| state: &'b mut Tree, | ||
| layout: Layout<'_>, | ||
| renderer: &Renderer, | ||
| translation: Vector, | ||
| ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> { | ||
| self.content.as_widget_mut().overlay(state, layout, renderer, translation) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.