Update tests and examples to removal of event::Raw type

Author: mitchmindtree

examples/canvas.rs

@@ -24,7 +24,7 @@ fn main() {
     events.set_ups(60);
 
     // construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // Add a `Font` to the `Ui`'s `font::Map` from file.
     let assets = find_folder::Search::KidsThenParents(3, 5).for_folder("assets").unwrap();

examples/counter.rs

@@ -24,7 +24,7 @@ fn main() {
     events.set_ups(60);
 
     // construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // Generate the widget identifiers.
     widget_ids!(struct Ids { canvas, counter });

examples/custom_widget.rs

@@ -248,7 +248,7 @@ pub fn main() {
     events.set_ups(60);
 
     // construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // The `widget_ids` macro is a easy, safe way of generating a type for producing `widget::Id`s.
     widget_ids! {

examples/file_navigator.rs

@@ -24,7 +24,7 @@ fn main() {
     events.set_ups(60);
 
     // Construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // A unique identifier for each widget.
     widget_ids!(struct Ids { canvas, file_navigator });

examples/glutin_gfx.rs

@@ -168,7 +168,7 @@ mod feature {
         let mut app = support::DemoApp::new();
 
         // Create Ui and Ids of widgets to instantiate
-        let mut ui = conrod::UiBuilder::new().theme(support::theme()).build();
+        let mut ui = conrod::UiBuilder::new([WIN_W as f64, WIN_H as f64]).theme(support::theme()).build();
         let ids = support::Ids::new(ui.widget_id_generator());
 
         // Load font from file
@@ -209,9 +209,6 @@ mod feature {
 
             let dpi_factor = window.hidpi_factor();
 
-            let dt_secs = 0.0;
-            ui.handle_event(conrod::event::render(dt_secs, win_w, win_h, dpi_factor as conrod::Scalar));
-
             if let Some(mut primitives) = ui.draw_if_changed() {
                 let (screen_width, screen_height) = (win_w as f32 * dpi_factor, win_h as f32 * dpi_factor);
                 let mut vertices = Vec::new();

examples/glutin_glium.rs

@@ -39,7 +39,7 @@ mod feature {
         let mut app = support::DemoApp::new();
 
         // Construct our `Ui`.
-        let mut ui = conrod::UiBuilder::new().theme(support::theme()).build();
+        let mut ui = conrod::UiBuilder::new([WIN_W as f64, WIN_H as f64]).theme(support::theme()).build();
 
         // The `widget::Id` of each widget instantiated in `support::gui`.
         let ids = support::Ids::new(ui.widget_id_generator());
@@ -81,12 +81,6 @@ mod feature {
         // - Repeat.
         'main: loop {
 
-            // Construct a render event for conrod at the beginning of rendering.
-            // NOTE: This will be removed in a future version of conrod as Render events shouldn't
-            // be necessary.
-            let window = display.get_window().unwrap();
-            ui.handle_event(conrod::backend::glutin::render_event(window).unwrap());
-
             // Poll for events.
             for event in display.poll_events() {
 
@@ -115,7 +109,7 @@ mod feature {
                 let (win_w, win_h) = (win_rect.w() as u32, win_rect.h() as u32);
                 let (w, h) = display.get_window().unwrap().get_inner_size_points().unwrap();
                 if w != win_w || h != win_h {
-                    let event: conrod::event::Raw = conrod::event::Input::Resize(w, h).into();
+                    let event = conrod::event::Input::Resize(w, h);
                     ui.handle_event(event);
                 }
             }

examples/image.rs

@@ -28,7 +28,7 @@ fn main() {
     events.set_ups(60);
 
     // construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // Create an empty texture to pass for the text cache as we're not drawing any text.
     let mut text_texture_cache = piston_window::GlyphCache::new(&mut window, 0, 0);
@@ -48,7 +48,11 @@ fn main() {
 
     // Poll events from the window.
     while let Some(event) = events.next(&mut window) {
-        ui.handle_event(event.clone());
+
+        // Convert the piston event to a conrod input event.
+        if let Some(e) = piston_window::convert_event(event.clone(), &window) {
+            ui.handle_event(e);
+        }
 
         window.draw_2d(&event, |c, g| {
             if let Some(primitives) = ui.draw_if_changed() {

examples/image_button.rs

@@ -32,7 +32,7 @@ fn main() {
     let mut events = WindowEvents::new();
 
     // construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // Add a `Font` to the `Ui`'s `font::Map` from file.
     let assets = find_folder::Search::KidsThenParents(3, 5).for_folder("assets").unwrap();

examples/list.rs

@@ -25,7 +25,7 @@ fn main() {
     events.set_ups(60);
 
     // Construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // Unique identifier for each widget.
     let ids = Ids::new(ui.widget_id_generator());

examples/list_select.rs

@@ -29,7 +29,7 @@ fn main() {
     events.set_ups(60);
 
     // Construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // A unique identifier for each widget.
     let ids = Ids::new(ui.widget_id_generator());

examples/old_demo.rs

@@ -110,7 +110,7 @@ fn main() {
     events.set_ups(60);
 
     // construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // Identifiers used for instantiating our widgets.
     let mut ids = Ids::new(ui.widget_id_generator());

examples/plot_path.rs

@@ -10,10 +10,12 @@ widget_ids! {
 }
 
 fn main() {
+    const WIDTH: u32 = 720;
+    const HEIGHT: u32 = 360;
 
     // Construct the window.
     let mut window: Window =
-        piston_window::WindowSettings::new("PlotPath Demo", [720, 360])
+        piston_window::WindowSettings::new("PlotPath Demo", [WIDTH, HEIGHT])
             .opengl(OpenGL::V3_2)
             .samples(4)
             .exit_on_esc(true)
@@ -25,7 +27,7 @@ fn main() {
     events.set_ups(60);
 
     // Construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // A unique identifier for each widget.
     let ids = Ids::new(ui.widget_id_generator());

examples/primitives.rs

@@ -22,21 +22,23 @@ widget_ids! {
 
 
 fn main() {
+    const WIDTH: u32 = 400;
+    const HEIGHT: u32 = 720;
 
     // Change this to OpenGL::V2_1 if not working.
     let opengl = OpenGL::V3_2;
 
     // Construct the window.
     let mut window: Window =
-        piston_window::WindowSettings::new("Primitives Demo", [400, 720])
+        piston_window::WindowSettings::new("Primitives Demo", [WIDTH, HEIGHT])
             .opengl(opengl).samples(4).exit_on_esc(true).build().unwrap();
 
     // Create the event loop.
     let mut events = WindowEvents::new();
     events.set_ups(60);
 
     // construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // A unique identifier for each widget.
     let ids = Ids::new(ui.widget_id_generator());

examples/range_slider.rs

@@ -27,7 +27,7 @@ fn main() {
     events.set_ups(60);
 
     // Construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // A unique identifier for each widget.
     let ids = Ids::new(ui.widget_id_generator());

examples/text.rs

@@ -22,7 +22,7 @@ fn main() {
     events.set_ups(60);
 
     // Construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // A unique identifier for each widget.
     let ids = Ids::new(ui.widget_id_generator());

examples/text_edit.rs

@@ -23,7 +23,7 @@ fn main() {
     events.set_ups(60);
 
     // Construct our `Ui`.
-    let mut ui = conrod::UiBuilder::new().build();
+    let mut ui = conrod::UiBuilder::new([WIDTH as f64, HEIGHT as f64]).build();
 
     // A unique identifier for each widget.
     let ids = Ids::new(ui.widget_id_generator());

src/tests/ui.rs

@@ -65,7 +65,7 @@ fn to_window_coordinates(xy: Point, ui: &Ui) -> Point {
 }
 
 fn windowless_ui() -> Ui {
-    UiBuilder::new().build()
+    UiBuilder::new([800.0, 600.0]).build()
 }
 
 

src/widget/id.rs

@@ -371,7 +371,7 @@ fn test() {
         }
     }
 
-    let mut ui = UiBuilder::new().build();
+    let mut ui = UiBuilder::new([800.0, 600.0]).build();
     let mut ids = Ids::new(ui.widget_id_generator());
 
     for _ in 0..10 {
@@ -402,7 +402,7 @@ fn test_invocation_variations() {
     widget_ids! { struct G { foo[], bar, } }
     widget_ids! { pub struct H { foo, bar[], } }
 
-    let mut ui = UiBuilder::new().build();
+    let mut ui = UiBuilder::new([800.0, 600.0]).build();
     let mut ui = ui.set_widgets();
     let a = A::new(ui.widget_id_generator());
     let b = B::new(ui.widget_id_generator());