Druid 0.5

This updates our crate versions, and also updates us to the latest
major versions of our dependencies, fixing any breakage. It also
removes anything marked as deprecated.

Author: cmyr

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "druid-derive"
-version = "0.1.2"
+version = "0.2.0"
 license = "Apache-2.0"
 authors = ["Druid authors"]
 description = "derive impls for druid, a Rust UI toolkit."
@@ -16,4 +16,4 @@ quote = "1.0.2"
 proc-macro2 = "1.0.4"
 
 [dev-dependencies]
-druid = { path = "../druid", version = "0.4.0" }
+druid = { path = "../druid", version = "0.5.0" }

druid-derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "druid-shell"
-version = "0.4.0"
+version = "0.5.0"
 license = "Apache-2.0"
 authors = ["Raph Levien <[email protected]>"]
 description = "Platform abstracting application shell used for druid toolkit."
@@ -16,18 +16,18 @@ use_gtk = ["gtk", "gtk-sys", "gio", "gdk", "gdk-sys", "glib", "glib-sys", "cairo
 default-target = "x86_64-pc-windows-msvc"
 
 [dependencies]
-piet-common = "0.0.7"
+piet-common = "0.0.8"
 log = "0.4.8"
 lazy_static = "1.0"
-time = "0.1.39"
+time = "0.2.4"
 cfg-if = "0.1.10"
 
-cairo-rs = {  version = "0.7.1", default_features = false, optional = true }
-gio = { version = "0.7.0", optional = true }
-gdk = { version = "0.11.0", optional = true }
+cairo-rs = {  version = "0.8.0", default_features = false, optional = true }
+gio = { version = "0.8.0", optional = true }
+gdk = { version = "0.12.0", optional = true }
 gdk-sys = { version = "0.9.0", optional = true }
-gtk = { version = "0.7.0", optional = true }
-glib = { version = "0.8.1", optional = true }
+gtk = { version = "0.8.0", optional = true }
+glib = { version = "0.9.1", optional = true }
 glib-sys = { version = "0.9.0", optional = true }
 gtk-sys = { version = "0.9.0", optional = true }
 
@@ -44,17 +44,17 @@ features = ["d2d1_1", "dwrite", "winbase", "libloaderapi", "errhandlingapi", "wi
 [target.'cfg(target_os="macos")'.dependencies]
 cocoa = "0.20.0"
 objc = "0.2.5"
-cairo-rs = { version = "0.7.1", default_features = false }
+cairo-rs = { version = "0.8.0", default_features = false }
 
 [target.'cfg(target_os="linux")'.dependencies]
-cairo-rs = {  version = "0.7.1", default_features = false }
-gio = "0.7.0"
-gdk = "0.11.0"
+cairo-rs = {  version = "0.8.0", default_features = false }
+gio = "0.8.0"
+gdk = "0.12.0"
 gdk-sys = "0.9.0"
-glib = "0.8.1"
+glib = "0.9.1"
 glib-sys = "0.9.0"
 gtk-sys = "0.9.0"
 
 [target.'cfg(target_os="linux")'.dependencies.gtk]
-version = "0.7.0"
+version = "0.8.0"
 features = ["v3_20"]

druid-shell/Cargo.toml

@@ -14,7 +14,7 @@
 
 use std::any::Any;
 
-use time::get_time;
+use time::Time;
 
 use piet_common::kurbo::{Line, Rect};
 use piet_common::{Color, FontBuilder, Piet, RenderContext, Text, TextLayoutBuilder};
@@ -44,7 +44,8 @@ impl WinHandler for PerfTest {
 
         piet.stroke(Line::new((0.0, height), (width, 0.0)), &FG_COLOR, 1.0);
 
-        let th = ::std::f64::consts::PI * (get_time().nsec as f64) * 2e-9;
+        let current_ns = Time::now().nanosecond();
+        let th = ::std::f64::consts::PI * (current_ns as f64) * 2e-9;
         let dx = 100.0 * th.sin();
         let dy = 100.0 * th.cos();
         piet.stroke(
@@ -59,8 +60,8 @@ impl WinHandler for PerfTest {
             .build()
             .unwrap();
 
-        let now = get_time();
-        let now = now.sec as f64 + 1e-9 * now.nsec as f64;
+        let now = Time::now();
+        let now = now.second() as f64 + 1e-9 * now.nanosecond() as f64;
         let msg = format!("{:3.1}ms", 1e3 * (now - self.last_time));
         self.last_time = now;
         let layout = piet.text().new_text_layout(&font, &msg).build().unwrap();

druid-shell/examples/perftest.rs

@@ -17,7 +17,7 @@
 use std::ffi::OsString;
 
 use crate::dialog::{FileDialogOptions, FileDialogType};
-use gtk::{FileChooserAction, FileChooserExt, NativeDialogExt, Window};
+use gtk::{FileChooserAction, FileChooserExt, NativeDialogExt, ResponseType, Window};
 
 use crate::Error;
 
@@ -44,13 +44,13 @@ pub(crate) fn get_file_dialog_path(
     let result = dialog.run();
 
     let result = match result {
-        gtk_sys::GTK_RESPONSE_ACCEPT => match dialog.get_filename() {
+        ResponseType::Accept => match dialog.get_filename() {
             Some(path) => Ok(path.into_os_string()),
             None => Err(Error::Other("No path received for filename")),
         },
-        gtk_sys::GTK_RESPONSE_CANCEL => Err(Error::Other("Dialog was deleted")),
+        ResponseType::Cancel => Err(Error::Other("Dialog was deleted")),
         _ => {
-            eprintln!("Unhandled dialog result: {:?}", result);
+            log::warn!("Unhandled dialog result: {:?}", result);
             Err(Error::Other("Unhandled dialog result"))
         }
     };

druid-shell/src/platform/gtk/dialog.rs

@@ -16,7 +16,8 @@
 
 use std::cell::RefCell;
 
-use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Cancellable};
+use gio::prelude::ApplicationExtManual;
+use gio::{ApplicationExt, ApplicationFlags, Cancellable};
 use gtk::Application;
 
 use super::util::assert_main_thread;

druid-shell/src/platform/gtk/runloop.rs

@@ -14,8 +14,6 @@
 
 //! Platform independent window types.
 
-#![allow(deprecated)] // for the three items that have moved
-
 use std::any::Any;
 
 use crate::dialog::{FileDialogOptions, FileInfo};

druid-shell/src/window.rs

@@ -1,6 +1,6 @@
 [package]
 name = "druid"
-version = "0.4.1"
+version = "0.5.0"
 license = "Apache-2.0"
 authors = ["Raph Levien <[email protected]>"]
 description = "Data-oriented Rust UI design toolkit."
@@ -27,16 +27,16 @@ fluent-syntax = "0.9.1"
 unic-langid = "0.7.1"
 unicode-segmentation = "1.3.0"
 log = "0.4.8"
-usvg = {version = "0.8.0", optional = true}
+usvg = {version = "0.9.0", optional = true}
 
 [dependencies.simple_logger]
 version = "1.3.0"
 default-features = false
 
 [dependencies.druid-shell]
 path = "../druid-shell"
-version = "0.4.0"
+version = "0.5.0"
 
 [dependencies.druid-derive]
 path = "../druid-derive"
-version = "0.1.1"
+version = "0.2.0"

druid/Cargo.toml

@@ -20,21 +20,6 @@ use crate::{
     BoxConstraints, Data, Env, Event, EventCtx, LayoutCtx, PaintCtx, UpdateCtx, Widget, WidgetPod,
 };
 
-/// A builder for a row widget that can contain flex children.
-///
-/// The actual widget is implemented by [`Flex`], but this builder
-/// is provided for convenience.
-///
-/// [`Flex`]: struct.Flex.html
-pub struct Row;
-/// A builder for a column widget that can contain flex children.
-///
-/// The actual widget is implemented by [`Flex`], but this builder
-/// is provided for convenience.
-///
-/// [`Flex`]: struct.Flex.html
-pub struct Column;
-
 /// A container with either horizontal or vertical layout.
 pub struct Flex<T: Data> {
     direction: Axis,
@@ -46,7 +31,7 @@ struct ChildWidget<T: Data> {
     params: Params,
 }
 
-pub enum Axis {
+pub(crate) enum Axis {
     Horizontal,
     Vertical,
 }
@@ -79,26 +64,6 @@ impl Axis {
     }
 }
 
-impl Row {
-    /// Create a new row widget.
-    ///
-    /// The child widgets are laid out horizontally, from left to right.
-    #[deprecated(since = "0.4.0", note = "Use Flex::row() instead")]
-    pub fn new<T: Data>() -> Flex<T> {
-        Flex::row()
-    }
-}
-
-impl Column {
-    /// Create a new row widget.
-    ///
-    /// The child widgets are laid out vertically, from top to bottom.
-    #[deprecated(since = "0.4.0", note = "Use Flex::column() instead")]
-    pub fn new<T: Data>() -> Flex<T> {
-        Flex::column()
-    }
-}
-
 impl<T: Data> Flex<T> {
     /// Create a new horizontal stack.
     ///

druid/src/widget/flex.rs

@@ -67,13 +67,6 @@ impl<T: Data> Label<T> {
         }
     }
 
-    /// Set text alignment.
-    #[inline]
-    #[deprecated(since = "0.4.1", note = "use text_align instead")]
-    pub fn align(self, align: UnitPoint) -> Self {
-        self.text_align(align)
-    }
-
     /// Set text alignment.
     pub fn text_align(mut self, align: UnitPoint) -> Self {
         self.align = align;

druid/src/widget/label.rs

@@ -46,7 +46,7 @@ pub use checkbox::Checkbox;
 pub use container::Container;
 pub use either::Either;
 pub use env_scope::EnvScope;
-pub use flex::{Column, Flex, Row};
+pub use flex::Flex;
 pub use identity_wrapper::IdentityWrapper;
 pub use label::{Label, LabelText};
 pub use list::{List, ListIter};

druid/src/widget/mod.rs

@@ -31,18 +31,6 @@ pub struct Padding<T: Data> {
 }
 
 impl<T: Data> Padding<T> {
-    /// Create widget with uniform padding.
-    #[deprecated(since = "0.3.0", note = "Use Padding::new() instead")]
-    pub fn uniform(padding: f64, child: impl Widget<T> + 'static) -> Padding<T> {
-        Padding {
-            left: padding,
-            right: padding,
-            top: padding,
-            bottom: padding,
-            child: WidgetPod::new(child).boxed(),
-        }
-    }
-
     /// Create a new widget with the specified padding. This can either be an instance
     /// of [`kurbo::Insets`], a f64 for uniform padding, a 2-tuple for axis-uniform padding
     /// or 4-tuple with (left, top, right, bottom) values.