diff options
| author |  bungoboingo <shankern@protonmail.com> | 2023-02-28 13:08:30 -0800 |
|---|---|---|
| committer | bungoboingo <shankern@protonmail.com> | 2023-02-28 13:08:30 -0800 |
| commit | 51296572c0189eaef8081c46270ff48b7e03258d (patch) | |
| tree | 067b3a9102f92e4869f2a63d739a49379a9fb481 /examples | |
| parent | a131f11a23d3430df58bf67a7c89f4b2284822af (diff) | |
| parent | 86b85d1436a44e82a9765f9d82b026faf26e22de (diff) | |
| download | iced-51296572c0189eaef8081c46270ff48b7e03258d.tar.gz iced-51296572c0189eaef8081c46270ff48b7e03258d.tar.bz2 iced-51296572c0189eaef8081c46270ff48b7e03258d.zip | |
Merge remote-tracking branch 'iced-main/master' into feat/multi-window-support
# Conflicts:
# glutin/src/application.rs
# winit/src/icon.rs
Diffstat (limited to '')
| -rw-r--r-- | examples/component/src/main.rs | 5 | ||||
| -rw-r--r-- | examples/scrollable/src/main.rs | 1 | ||||
| -rw-r--r-- | examples/websocket/src/main.rs | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/examples/component/src/main.rs b/examples/component/src/main.rs index c407bb06..bbf549e7 100644 --- a/examples/component/src/main.rs +++ b/examples/component/src/main.rs @@ -127,7 +127,8 @@ mod numeric_input { .horizontal_alignment(alignment::Horizontal::Center) .vertical_alignment(alignment::Vertical::Center), ) - .width(50) + .width(40) + .height(40) .on_press(on_press) }; @@ -145,7 +146,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/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] |