diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-03-07 07:24:34 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-03-07 07:24:34 +0100 |
| commit | aa4b5bb6b962b48715023e3ce567d1a18473bffa (patch) | |
| tree | 5dcb839dac56c81a9b9b618db86f67f3e72af9d3 /examples | |
| parent | d3900e067361c82fd857fc92b81284146140bc3b (diff) | |
| parent | df68cca0c9dda051ae979ccc2f5ca8d37c3e3cb5 (diff) | |
| download | iced-aa4b5bb6b962b48715023e3ce567d1a18473bffa.tar.gz iced-aa4b5bb6b962b48715023e3ce567d1a18473bffa.tar.bz2 iced-aa4b5bb6b962b48715023e3ce567d1a18473bffa.zip | |
Merge branch 'master' into feature/software-renderer
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/component/src/main.rs | 5 | ||||
| -rw-r--r-- | examples/scrollable/src/main.rs | 1 | ||||
| -rw-r--r-- | examples/todos/src/main.rs | 21 | ||||
| -rw-r--r-- | examples/websocket/src/main.rs | 4 |
4 files changed, 26 insertions, 5 deletions
diff --git a/examples/component/src/main.rs b/examples/component/src/main.rs index e59588b1..09e5e4a2 100644 --- a/examples/component/src/main.rs +++ b/examples/component/src/main.rs @@ -120,7 +120,8 @@ mod numeric_input { .horizontal_alignment(alignment::Horizontal::Center) .vertical_alignment(alignment::Vertical::Center), ) - .width(50) + .width(40) + .height(40) .on_press(on_press) }; @@ -138,7 +139,7 @@ mod numeric_input { .padding(10), button("+", Event::IncrementPressed), ] - .align_items(Alignment::Fill) + .align_items(Alignment::Center) .spacing(10) .into() } diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs index 7c858961..a3ade54f 100644 --- a/examples/scrollable/src/main.rs +++ b/examples/scrollable/src/main.rs @@ -254,7 +254,6 @@ impl Application for ScrollableDemo { scroll_to_beginning_button(), vertical_space(40), ] - .align_items(Alignment::Fill) .spacing(40), horizontal_space(1200), text("Horizontal - End!"), diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs index 5df4e968..1cc18eca 100644 --- a/examples/todos/src/main.rs +++ b/examples/todos/src/main.rs @@ -1,7 +1,7 @@ use iced::alignment::{self, Alignment}; use iced::event::{self, Event}; use iced::font::{self, Font}; -use iced::keyboard; +use iced::keyboard::{self, KeyCode, Modifiers}; use iced::subscription; use iced::theme::{self, Theme}; use iced::widget::{ @@ -52,6 +52,7 @@ enum Message { FilterChanged(Filter), TaskMessage(usize, TaskMessage), TabPressed { shift: bool }, + ToggleFullscreen(window::Mode), } impl Application for Todos { @@ -162,6 +163,9 @@ impl Application for Todos { widget::focus_next() } } + Message::ToggleFullscreen(mode) => { + window::change_mode(mode) + } _ => Command::none(), }; @@ -272,6 +276,21 @@ impl Application for Todos { ) => Some(Message::TabPressed { shift: modifiers.shift(), }), + ( + Event::Keyboard(keyboard::Event::KeyPressed { + key_code, + modifiers: Modifiers::SHIFT, + }), + event::Status::Ignored, + ) => match key_code { + KeyCode::Up => { + Some(Message::ToggleFullscreen(window::Mode::Fullscreen)) + } + KeyCode::Down => { + Some(Message::ToggleFullscreen(window::Mode::Windowed)) + } + _ => None, + }, _ => None, }) } diff --git a/examples/websocket/src/main.rs b/examples/websocket/src/main.rs index ccd9c815..e617b8ce 100644 --- a/examples/websocket/src/main.rs +++ b/examples/websocket/src/main.rs @@ -146,7 +146,9 @@ impl Application for WebSocket { } } - row![input, button].spacing(10).align_items(Alignment::Fill) + row![input, button] + .spacing(10) + .align_items(Alignment::Center) }; column![message_log, new_message_input] |