From aac7ad3e14aaa9faf7d52fe9b91bc64cb037d576 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 9 Mar 2020 22:35:25 +0100
Subject: Update `winit` to `0.22`

---
 examples/integration/src/main.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'examples')

diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 4be913c1..2cb89ffc 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -10,7 +10,7 @@ use iced_wgpu::{
 use iced_winit::{winit, Cache, Clipboard, MouseCursor, Size, UserInterface};
 
 use winit::{
-    event::{DeviceEvent, Event, ModifiersState, WindowEvent},
+    event::{Event, ModifiersState, WindowEvent},
     event_loop::{ControlFlow, EventLoop},
 };
 
@@ -66,14 +66,11 @@ pub fn main() {
         *control_flow = ControlFlow::Wait;
 
         match event {
-            Event::DeviceEvent {
-                event: DeviceEvent::ModifiersChanged(new_modifiers),
-                ..
-            } => {
-                modifiers = new_modifiers;
-            }
             Event::WindowEvent { event, .. } => {
                 match event {
+                    WindowEvent::ModifiersChanged(new_modifiers) => {
+                        modifiers = new_modifiers;
+                    }
                     WindowEvent::Resized(new_size) => {
                         logical_size =
                             new_size.to_logical(window.scale_factor());
@@ -82,6 +79,7 @@ pub fn main() {
                     WindowEvent::CloseRequested => {
                         *control_flow = ControlFlow::Exit;
                     }
+
                     _ => {}
                 }
 
-- 
cgit 


From e1438774af809c2951c4c7446638500446c81111 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 14 Mar 2020 23:25:19 +0100
Subject: Fix `Scrollable` width consistency

---
 examples/styling/src/main.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'examples')

diff --git a/examples/styling/src/main.rs b/examples/styling/src/main.rs
index 47408624..d6f41b04 100644
--- a/examples/styling/src/main.rs
+++ b/examples/styling/src/main.rs
@@ -93,6 +93,7 @@ impl Sandbox for Styling {
             ProgressBar::new(0.0..=100.0, self.slider_value).style(self.theme);
 
         let scrollable = Scrollable::new(&mut self.scroll)
+            .width(Length::Fill)
             .height(Length::Units(100))
             .style(self.theme)
             .push(Text::new("Scroll me!"))
-- 
cgit