From c7813afe19494db312508b13fd581eebdb2d2962 Mon Sep 17 00:00:00 2001 From: daa84 Date: Thu, 23 Jun 2016 17:32:30 +0300 Subject: [PATCH] Update version dependency, fix compilations --- Cargo.lock | 234 ++++++++++++++++++++++++++++----------------------- Cargo.toml | 13 ++- src/input.rs | 6 +- src/ui.rs | 4 +- 4 files changed, 139 insertions(+), 118 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a92e62..cfd4127 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,27 +2,27 @@ name = "neovim-gtk" version = "0.1.0" dependencies = [ - "cairo-rs 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gtk 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "neovim-lib 0.1.0", - "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gtk 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "neovim-lib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", "rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "atk-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -31,6 +31,11 @@ name = "bitflags" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "byteorder" version = "0.3.13" @@ -43,229 +48,248 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cairo-rs" -version = "0.0.8" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "c_vec 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cairo-sys-rs" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gdk" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cairo-rs 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "pango 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gdk-pixbuf" -version = "0.0.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gdk-pixbuf-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gdk-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "pango-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "gio" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "gio-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glib" -version = "0.0.8" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gio-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glib-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gobject-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gtk" -version = "0.0.7" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cairo-rs 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gtk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gtk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "pango 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gtk-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "atk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "atk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "pango-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.2.8" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "log" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "neovim-lib" -version = "0.1.0" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rmp-serialize 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pango" -version = "0.0.7" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "pango-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pango-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -278,7 +302,7 @@ name = "rand" version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -295,11 +319,11 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-serialize" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/Cargo.toml b/Cargo.toml index 1614005..d7409be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,22 +5,19 @@ authors = ["daa84 "] build = "build.rs" [dependencies] -cairo-rs = "0.0.8" -glib = "0.0.8" +cairo-rs = "0.1" +glib = "0.1" glib-sys = "0.3" -gdk = "0.3" +gdk = "0.5" gdk-sys = "0.3" -#neovim-lib = "0.1" +neovim-lib = "^0.1.1" rmp = "0.7" phf = "0.7" [build-dependencies] phf_codegen = "0.7" -[dependencies.neovim-lib] -path = "../neovim-lib/" - [dependencies.gtk] -version = "0.0.7" +version = "0.1" features = ["v3_10"] diff --git a/src/input.rs b/src/input.rs index 680bb71..23ed439 100644 --- a/src/input.rs +++ b/src/input.rs @@ -8,13 +8,13 @@ include!(concat!(env!("OUT_DIR"), "/key_map_table.rs")); pub fn keyval_to_input_string(val: &str, state: gdk::ModifierType) -> String { let mut input = String::from("<"); - if state.contains(gdk::enums::modifier_type::ShiftMask) { + if state.contains(gdk::SHIFT_MASK) { input.push_str("S-"); } - if state.contains(gdk::enums::modifier_type::ControlMask) { + if state.contains(gdk::CONTROL_MASK) { input.push_str("C-"); } - if state.contains(gdk::enums::modifier_type::Mod1Mask) { + if state.contains(gdk::MOD1_MASK) { input.push_str("A-"); } input.push_str(val); diff --git a/src/ui.rs b/src/ui.rs index a1951f3..1c8c39b 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -231,7 +231,7 @@ fn gtk_draw(_: &DrawingArea, ctx: &cairo::Context) -> Inhibit { Inhibit(false) } -fn gtk_configure_event(_: &DrawingArea, ev: &EventConfigure) -> Inhibit { +fn gtk_configure_event(_: &DrawingArea, ev: &EventConfigure) -> bool { UI.with(|ui_cell| { let mut ui = ui_cell.borrow_mut(); let (width, height) = ev.get_size(); @@ -260,7 +260,7 @@ fn gtk_configure_event(_: &DrawingArea, ev: &EventConfigure) -> Inhibit { } } }); - Inhibit(false) + false } fn draw(ui: &Ui, ctx: &cairo::Context) {