Fix

2020-08-14 15:57:31 -07:00 · 2020-08-14 15:57:31 -07:00 · f2cc0d68fc
parent 4b86519fa0
commit f2cc0d68fc
12 changed files with 189 additions and 297 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2,9 +2,9 @@
 # It is not intended for manual editing.
 [[package]]
 name = "adler32"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d"
+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"

 [[package]]
 name = "approx"
@ -45,21 +45,18 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1"

-[[package]]
-name = "base64"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "base64"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"

+[[package]]
+name = "base64"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
+
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@ -112,9 +109,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"

 [[package]]
 name = "bytemuck"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431"
+checksum = "db7a1029718df60331e557c9e83a55523c955e5dd2a7bfeffad6bbd50b538ae9"

 [[package]]
 name = "byteorder"
@ -237,37 +234,10 @@ dependencies = [
 "lazy_static",
 ]

-[[package]]
-name = "cssparser"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7063452c60432cb306ed54d538178c20792d47fa960c240ce6c083239ee55ec"
-dependencies = [
- "cssparser-macros",
- "matches",
- "phf",
- "procedural-masquerade",
- "quote 0.3.15",
- "syn 0.11.11",
-]
-
-[[package]]
-name = "cssparser-macros"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb1c84e87c717666564ec056105052331431803d606bd45529b28547b611eef"
-dependencies = [
- "phf_codegen",
- "proc-macro2",
- "procedural-masquerade",
- "quote 1.0.7",
- "syn 1.0.33",
-]
-
 [[package]]
 name = "dces"
-version = "0.3.0"
-source = "git+https://gitlab.redox-os.org/redox-os/dces-rust.git?branch=develop#58f66adc80a32f28cf915ef07113db07941343bb"
+version = "0.3.1"
+source = "git+https://gitlab.redox-os.org/redox-os/dces-rust.git?branch=develop#562c72e5ade8e9734ab6caa5379644a692054f7f"

 [[package]]
 name = "deflate"
@ -296,8 +266,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.33",
+ "quote",
+ "syn",
 ]

 [[package]]
@ -336,15 +306,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"

-[[package]]
-name = "dlib"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76"
-dependencies = [
- "libloading",
-]
-
 [[package]]
 name = "downcast-rs"
 version = "1.2.0"
@ -353,9 +314,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"

 [[package]]
 name = "either"
-version = "1.5.3"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f"

 [[package]]
 name = "euclid"
@ -421,9 +382,9 @@ dependencies = [

 [[package]]
 name = "hashbag"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "452b31b3ffe7cf13de531eefae493301c85995a953c808d7c79a8f45abae0706"
+checksum = "a9be661681f30f8ef0f5bd6a2bff28b16cbcffc0e1b79d18558b74d5e1817fbb"

 [[package]]
 name = "hermit-abi"
@ -436,9 +397,9 @@ dependencies = [

 [[package]]
 name = "image"
-version = "0.23.6"
+version = "0.23.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b0553fec6407d63fe2975b794dfb099f3f790bdc958823851af37b26404ab4"
+checksum = "543904170510c1b5fb65140485d84de4a57fddb2ed685481e9020ce3d2c9f64c"
 dependencies = [
 "bytemuck",
 "byteorder",
@ -447,7 +408,7 @@ dependencies = [
 "num-iter",
 "num-rational",
 "num-traits",
- "png 0.16.6",
+ "png 0.16.7",
 "scoped_threadpool",
 "tiff",
 ]
@ -490,9 +451,9 @@ dependencies = [

 [[package]]
 name = "js-sys"
-version = "0.3.41"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4b9172132a62451e56142bff9afc91c8e4a4500aa5b847da36815b63bfda916"
+checksum = "85a7e2c92a4804dd459b86c339278d0fe87cf93757fae222c3fa3ae75458bc73"
 dependencies = [
 "wasm-bindgen",
 ]
@ -505,24 +466,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.72"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701"
-
-[[package]]
-name = "libloading"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cadb8e769f070c45df05c78c7520eb4cd17061d4ab262e43cfc68b4d00ac71c"
-dependencies = [
- "winapi",
-]
+checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"

 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
 "cfg-if",
 ]
@ -550,18 +502,18 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"

-[[package]]
-name = "matches"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-
 [[package]]
 name = "maybe-uninit"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"

+[[package]]
+name = "memchr"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+
 [[package]]
 name = "memoffset"
 version = "0.5.5"
@ -573,8 +525,8 @@ dependencies = [

 [[package]]
 name = "minifb"
-version = "0.16.0"
-source = "git+https://github.com/FloVanGH/rust_minifb?branch=redox_unix#729a68c2e40c620dc1cbb9c9b116de21385a10a0"
+version = "0.17.0"
+source = "git+https://github.com/FloVanGH/rust_minifb?branch=redox_unix#8a9d70d080e789887ea4b9ba0d8920cdf8676d32"
 dependencies = [
 "cast",
 "cc",
@ -612,6 +564,16 @@ dependencies = [
 "void",
 ]

+[[package]]
+name = "nom"
+version = "5.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
+dependencies = [
+ "memchr",
+ "version_check",
+]
+
 [[package]]
 name = "num"
 version = "0.1.42"
@ -698,16 +660,16 @@ dependencies = [

 [[package]]
 name = "orbtk"
-version = "0.3.1-alpha3"
-source = "git+https://github.com/redox-os/orbtk.git?branch=develop#cef2271030b413d680e3d73c6f9c733f1971229a"
+version = "0.3.1-alpha4"
+source = "git+https://github.com/redox-os/orbtk.git?branch=develop#149d3cc79da6cd6427e17d5fb721542de5492431"
 dependencies = [
 "dces",
 "orbtk-api",
- "orbtk-css-engine",
 "orbtk-proc-macros",
 "orbtk-render",
 "orbtk-shell",
 "orbtk-theme",
+ "orbtk-theming",
 "orbtk-tree",
 "orbtk-utils",
 "orbtk-widgets",
@ -715,17 +677,17 @@ dependencies = [

 [[package]]
 name = "orbtk-api"
-version = "0.3.1-alpha3"
-source = "git+https://github.com/redox-os/orbtk.git?branch=develop#cef2271030b413d680e3d73c6f9c733f1971229a"
+version = "0.3.1-alpha4"
+source = "git+https://github.com/redox-os/orbtk.git?branch=develop#149d3cc79da6cd6427e17d5fb721542de5492431"
 dependencies = [
 "dces",
 "derive_more",
 "dirs",
- "orbtk-css-engine",
 "orbtk-proc-macros",
 "orbtk-render",
 "orbtk-shell",
 "orbtk-theme",
+ "orbtk-theming",
 "orbtk-tree",
 "orbtk-utils",
 "raw-window-handle",
@ -735,30 +697,21 @@ dependencies = [
 "stdweb",
 ]

-[[package]]
-name = "orbtk-css-engine"
-version = "0.3.1-alpha3"
-source = "git+https://github.com/redox-os/orbtk.git?branch=develop#cef2271030b413d680e3d73c6f9c733f1971229a"
-dependencies = [
- "cssparser",
- "orbtk-utils",
-]
-
 [[package]]
 name = "orbtk-proc-macros"
-version = "0.3.1-alpha3"
-source = "git+https://github.com/redox-os/orbtk.git?branch=develop#cef2271030b413d680e3d73c6f9c733f1971229a"
+version = "0.3.1-alpha4"
+source = "git+https://github.com/redox-os/orbtk.git?branch=develop#149d3cc79da6cd6427e17d5fb721542de5492431"
 dependencies = [
 "case",
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.33",
+ "quote",
+ "syn",
 ]

 [[package]]
 name = "orbtk-render"
-version = "0.3.1-alpha3"
-source = "git+https://github.com/redox-os/orbtk.git?branch=develop#cef2271030b413d680e3d73c6f9c733f1971229a"
+version = "0.3.1-alpha4"
+source = "git+https://github.com/redox-os/orbtk.git?branch=develop#149d3cc79da6cd6427e17d5fb721542de5492431"
 dependencies = [
 "image",
 "orbtk-utils",
@ -769,8 +722,8 @@ dependencies = [

 [[package]]
 name = "orbtk-shell"
-version = "0.3.1-alpha3"
-source = "git+https://github.com/redox-os/orbtk.git?branch=develop#cef2271030b413d680e3d73c6f9c733f1971229a"
+version = "0.3.1-alpha4"
+source = "git+https://github.com/redox-os/orbtk.git?branch=develop#149d3cc79da6cd6427e17d5fb721542de5492431"
 dependencies = [
 "console_error_panic_hook",
 "derive_more",
@ -786,30 +739,45 @@ dependencies = [

 [[package]]
 name = "orbtk-theme"
-version = "0.3.1-alpha3"
-source = "git+https://github.com/redox-os/orbtk.git?branch=develop#cef2271030b413d680e3d73c6f9c733f1971229a"
+version = "0.3.1-alpha4"
+source = "git+https://github.com/redox-os/orbtk.git?branch=develop#149d3cc79da6cd6427e17d5fb721542de5492431"
 dependencies = [
 "lazy_static",
- "orbtk-css-engine",
+ "orbtk-theming",
+]
+
+[[package]]
+name = "orbtk-theming"
+version = "0.3.1-alpha4"
+source = "git+https://github.com/redox-os/orbtk.git?branch=develop#149d3cc79da6cd6427e17d5fb721542de5492431"
+dependencies = [
+ "ron",
+ "serde",
+ "serde_derive",
 ]

 [[package]]
 name = "orbtk-tree"
-version = "0.3.1-alpha3"
-source = "git+https://github.com/redox-os/orbtk.git?branch=develop#cef2271030b413d680e3d73c6f9c733f1971229a"
+version = "0.3.1-alpha4"
+source = "git+https://github.com/redox-os/orbtk.git?branch=develop#149d3cc79da6cd6427e17d5fb721542de5492431"
 dependencies = [
 "dces",
 ]

 [[package]]
 name = "orbtk-utils"
-version = "0.3.1-alpha3"
-source = "git+https://github.com/redox-os/orbtk.git?branch=develop#cef2271030b413d680e3d73c6f9c733f1971229a"
+version = "0.3.1-alpha4"
+source = "git+https://github.com/redox-os/orbtk.git?branch=develop#149d3cc79da6cd6427e17d5fb721542de5492431"
+dependencies = [
+ "derive_more",
+ "ron",
+ "serde",
+]

 [[package]]
 name = "orbtk-widgets"
-version = "0.3.1-alpha3"
-source = "git+https://github.com/redox-os/orbtk.git?branch=develop#cef2271030b413d680e3d73c6f9c733f1971229a"
+version = "0.3.1-alpha4"
+source = "git+https://github.com/redox-os/orbtk.git?branch=develop#149d3cc79da6cd6427e17d5fb721542de5492431"
 dependencies = [
 "dces",
 "lazy_static",
@ -859,8 +827,8 @@ dependencies = [
 "pest",
 "pest_meta",
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.33",
+ "quote",
+ "syn",
 ]

 [[package]]
@ -874,44 +842,6 @@ dependencies = [
 "sha-1",
 ]

-[[package]]
-name = "phf"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-dependencies = [
- "phf_shared",
- "rand 0.6.5",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "pkg-config"
 version = "0.3.18"
@ -932,9 +862,9 @@ dependencies = [

 [[package]]
 name = "png"
-version = "0.16.6"
+version = "0.16.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c150bf7479fafe3dd8740dbe48cc33b2a3efb7b0fe3483aced8bbc39f6d0238d"
+checksum = "dfe7f9f1c730833200b134370e1d5098964231af8450bce9b78ee3ab5278b970"
 dependencies = [
 "bitflags",
 "crc32fast",
@ -950,25 +880,13 @@ checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"

 [[package]]
 name = "proc-macro2"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
 dependencies = [
- "unicode-xid 0.2.1",
+ "unicode-xid",
 ]

-[[package]]
-name = "procedural-masquerade"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1383dff4092fe903ac180e391a8d4121cc48f08ccf850614b0290c6673b69d"
-
-[[package]]
-name = "quote"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
-
 [[package]]
 name = "quote"
 version = "1.0.7"
@ -1219,11 +1137,11 @@ dependencies = [

 [[package]]
 name = "ron"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
+checksum = "a91260f321dbf3b5a16ff91c451dc9eb644ce72775a6812f9c3dfffe63818f8f"
 dependencies = [
- "base64 0.10.1",
+ "base64 0.12.3",
 "bitflags",
 "serde",
 ]
@ -1254,9 +1172,9 @@ dependencies = [

 [[package]]
 name = "rust_decimal"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b5f52edf35045e96b07aa29822bf4ce8495295fd5610270f85ab1f26df7ba5"
+checksum = "95ba36e8c41bf675947e200af432325f332f60a0aea0ef2dc456636c2f6037d7"
 dependencies = [
 "num-traits",
 "serde",
@ -1288,12 +1206,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"

-[[package]]
-name = "scoped-tls"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
-
 [[package]]
 name = "scoped_threadpool"
 version = "0.1.9"
@ -1347,29 +1259,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"

 [[package]]
 name = "serde"
-version = "1.0.114"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.114"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
+checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.33",
+ "quote",
+ "syn",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
+checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
 dependencies = [
 "itoa",
 "ryu",
@ -1394,12 +1306,6 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"

-[[package]]
-name = "siphasher"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-
 [[package]]
 name = "slab"
 version = "0.4.2"
@ -1408,9 +1314,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"

 [[package]]
 name = "smallvec"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f"
+checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"

 [[package]]
 name = "spin_sleep"
@ -1454,10 +1360,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
+ "quote",
 "serde",
 "serde_derive",
- "syn 1.0.33",
+ "syn",
 ]

 [[package]]
@ -1468,12 +1374,12 @@ checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
 "base-x",
 "proc-macro2",
- "quote 1.0.7",
+ "quote",
 "serde",
 "serde_derive",
 "serde_json",
 "sha1",
- "syn 1.0.33",
+ "syn",
 ]

 [[package]]
@ -1484,39 +1390,19 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"

 [[package]]
 name = "sw-composite"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f414e0c648cea54e6aa44f044a70ffc51fb9a5c6684bcfca89a70f74dde2dff"
+checksum = "a042aba3c316feb8b9624ba0369240b84ecdf1b2eff58b2c8987ba2dfa22ac4d"

 [[package]]
 name = "syn"
-version = "0.11.11"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
-dependencies = [
- "quote 0.3.15",
- "synom",
- "unicode-xid 0.0.4",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
+checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "unicode-xid 0.2.1",
-]
-
-[[package]]
-name = "synom"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
-dependencies = [
- "unicode-xid 0.0.4",
+ "quote",
+ "unicode-xid",
 ]

 [[package]]
@ -1562,18 +1448,18 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"

-[[package]]
-name = "unicode-xid"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

+[[package]]
+name = "version_check"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+
 [[package]]
 name = "void"
 version = "1.0.2"
@ -1588,9 +1474,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.64"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a634620115e4a229108b71bde263bb4220c483b3f07f5ba514ee8d15064c4c2"
+checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
 dependencies = [
 "cfg-if",
 "wasm-bindgen-macro",
@ -1598,59 +1484,58 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.64"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e53963b583d18a5aa3aaae4b4c1cb535218246131ba22a71f05b518098571df"
+checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0"
 dependencies = [
 "bumpalo",
 "lazy_static",
 "log",
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.33",
+ "quote",
+ "syn",
 "wasm-bindgen-shared",
 ]

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.64"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcfd5ef6eec85623b4c6e844293d4516470d8f19cd72d0d12246017eb9060b8"
+checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2"
 dependencies = [
- "quote 1.0.7",
+ "quote",
 "wasm-bindgen-macro-support",
 ]

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.64"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9adff9ee0e94b926ca81b57f57f86d5545cdcb1d259e21ec9bdd95b901754c75"
+checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.33",
+ "quote",
+ "syn",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.64"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7b90ea6c632dd06fd765d44542e234d5e63d9bb917ecd64d79778a13bd79ae"
+checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092"

 [[package]]
 name = "wayland-client"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42cb608953ec8e132c7f53fde722cca9bfbf8b2071d685dbbb8df2b567fee8b"
+checksum = "ab702fefbcd6d6f67fb5816e3a89a3b5a42a94290abbc015311c9a30d1068ae4"
 dependencies = [
 "bitflags",
 "downcast-rs",
 "libc",
 "nix",
- "scoped-tls",
 "wayland-commons",
 "wayland-scanner",
 "wayland-sys",
@ -1658,9 +1543,9 @@ dependencies = [

 [[package]]
 name = "wayland-commons"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8caa2f106138cf71358c6a9e84468e4406069cec93cbd6dbfce92225fc175932"
+checksum = "e972e9336ad5a9dd861b4e21ff35ad71d3e5c6b4803d65c39913612f851b95f1"
 dependencies = [
 "nix",
 "once_cell",
@ -1670,19 +1555,20 @@ dependencies = [

 [[package]]
 name = "wayland-cursor"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d774f69a6a4a9eac6d1a29cea45a4750ee7f997520421b2068f099a11b4cbba"
+checksum = "539f346e1a3f706f38c8ccbe1196001e2fb1c9b3e6b605c27d665db2f5b60d41"
 dependencies = [
+ "nix",
 "wayland-client",
- "wayland-sys",
+ "xcursor",
 ]

 [[package]]
 name = "wayland-protocols"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f784a990d5fa6d846fa93eb8d3bb744ff1e6ec60c7f785b0a0ee2f1a1f20bee9"
+checksum = "f3d6fc54b17b98b5083bc21ae3a30e6d75cb4b01647360e4c3a04648bcf8781d"
 dependencies = [
 "bitflags",
 "wayland-client",
@ -1692,29 +1578,29 @@ dependencies = [

 [[package]]
 name = "wayland-scanner"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f45ddc08a8078f3efa96b5f413268cc9c53b30712891de081fbc1d5846fbc736"
+checksum = "030f56009d932bd9400bb472764fea8109be1b0fc482d9cd75496c943ac30328"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
+ "quote",
 "xml-rs",
 ]

 [[package]]
 name = "wayland-sys"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80f9fc64f9045ad5ff491886a9460437655353e8be73c1b3f29f569342553319"
+checksum = "8bdeffbbb474477dfa2acb45ac7479e5fe8f741c64ab032c5d11b94d07edc269"
 dependencies = [
- "dlib",
+ "pkg-config",
 ]

 [[package]]
 name = "web-sys"
-version = "0.3.41"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "863539788676619aac1a23e2df3655e96b32b0e05eb72ca34ba045ad573c625d"
+checksum = "dda38f4e5ca63eda02c059d243aa25b5f35ab98451e518c51612cd0f1bd19a47"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@ -1754,6 +1640,15 @@ dependencies = [
 "pkg-config",
 ]

+[[package]]
+name = "xcursor"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3a481cfdefd35e1c50073ae33a8000d695c98039544659f5dc5dd71311b0d01"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "xkb"
 version = "0.2.1"
--- a/res/example.qml
+++ b/res/example.qml
@ -45,20 +45,20 @@ Grid {
                ]]
            }
        }
-                Rectangle {
-                    color: "#b29dbe"
-                    ComboBox {
-                        id: combobox
-                        anchors.centerIn: parent
-                        items =  [[
-                             ["1", "World", "@@#$@#"]
-                        ]]
-                        selected: 2
-                        onselect = [[
-                           update_property("target", "text", get_property("combobox","selected"));
-                        ]]
-                    }
-                }
+        Rectangle {
+            color: "#b29dbe"
+            ComboBox {
+                id: combobox
+                anchors.centerIn: parent
+                items =  [[
+                     ["1", "World", "@@#$@#"]
+                ]]
+                selected: 2
+                onselect = [[
+                   update_property("target", "text", get_property("combobox","selected"));
+                ]]
+            }
+        }
        Rectangle {
            color: "#F3F0F4"
            Button {
--- a/src/lib.rs
+++ b/src/lib.rs
@ -46,6 +46,7 @@ impl Widget for MainViewState {
            code: Default::default(),
        };
        let this = QmlWidgetBuilder::new().build(widget, 0, 0, top_level[0].0.clone(), top_level[0].1.clone(), ctx, qmlctx.borrow_mut()); //render_ctx(widget, ctx, &top_level, 0, 0, ids.borrow_mut()).unwrap();
+        ctx.register_property("dirty", widget, false);
        ctx.register_state(
            this,
            Box::new(MVState {
--- a/src/widget_builders/button.rs
+++ b/src/widget_builders/button.rs
@ -4,7 +4,7 @@ use crate::state;
 use crate::widget_builders::{QmlContext, WidgetBuilder};
 use orbtk::prelude::HashMap;
 use orbtk::prelude::*;
-use orbtk::Entity;
+

 pub struct ButtonBuilder {}

--- a/src/widget_builders/combobox.rs
+++ b/src/widget_builders/combobox.rs
@ -4,7 +4,6 @@ use crate::state;
 use crate::widget_builders::{parse_number, QmlContext, WidgetBuilder};
 use orbtk::prelude::HashMap;
 use orbtk::prelude::*;
-use orbtk::Entity;
 use rhai::{Array, Engine};
 use std::ops::Index;

@ -53,7 +52,7 @@ impl WidgetBuilder for ComboBoxBuilder {
                _ => String::new(),
            };

-            combo_box = combo_box.on_changed(move |states, _| {
+            combo_box = combo_box.on_changed(move |states, _, _ | {
                state(id, states).action(code.clone());
            });

--- a/src/widget_builders/grid.rs
+++ b/src/widget_builders/grid.rs
@ -2,7 +2,7 @@ use crate::parser::{Value, QML};
 use crate::widget_builders::{parse_number, QmlContext, QmlWidgetBuilder, WidgetBuilder};
 use orbtk::prelude::HashMap;
 use orbtk::prelude::*;
-use orbtk::Entity;
+

 pub struct GridBuilder {}

@ -15,15 +15,15 @@ impl WidgetBuilder for GridBuilder {
            let rows = parse_number(properties.get("rows")) as u32;
            let cols = parse_number(properties.get("columns")) as u32;

-            let mut grid_rows = Rows::new();
+            let mut grid_rows = Rows::create();
            for _i in 0..rows {
-                grid_rows = grid_rows.add("stretch");
+                grid_rows = grid_rows.push("stretch");
            }
            grid = grid.rows(grid_rows.build());

-            let mut grid_cols = Columns::new();
+            let mut grid_cols = Columns::create();
            for _i in 0..rows {
-                grid_cols = grid_cols.add("stretch");
+                grid_cols = grid_cols.push("stretch");
            }
            grid = grid.columns(grid_cols.build());

--- a/src/widget_builders/image.rs
+++ b/src/widget_builders/image.rs
@ -4,7 +4,7 @@ use crate::state;
 use crate::widget_builders::{QmlContext, WidgetBuilder};
 use orbtk::prelude::HashMap;
 use orbtk::prelude::*;
-use orbtk::Entity;
+

 pub struct ImageBuilder {}

--- a/src/widget_builders/import.rs
+++ b/src/widget_builders/import.rs
@ -3,7 +3,6 @@ use crate::parser::{parse_qml, Value, QML};
 use crate::widget_builders::{parse_number, QmlContext, QmlWidgetBuilder, WidgetBuilder};
 use orbtk::prelude::HashMap;
 use orbtk::prelude::*;
-use orbtk::Entity;
 use std::borrow::BorrowMut;

 pub struct ImportBuilder {
--- a/src/widget_builders/mod.rs
+++ b/src/widget_builders/mod.rs
@ -6,7 +6,7 @@ use crate::widget_builders::rectangle::RectangleBuilder;
 use crate::widget_builders::textedit::TextEditBuilder;
 use crate::widget_builders::textfield::TextBuilder;
 use orbtk::prelude::*;
-use orbtk::Entity;
+

 use crate::widget_builders::combobox::ComboBoxBuilder;
 use crate::widget_builders::image::ImageBuilder;
--- a/src/widget_builders/rectangle.rs
+++ b/src/widget_builders/rectangle.rs
@ -3,7 +3,6 @@ use crate::parser::{Value, QML};
 use crate::widget_builders::{parse_color_property, parse_number, QmlContext, QmlWidgetBuilder, WidgetBuilder};
 use orbtk::prelude::HashMap;
 use orbtk::prelude::*;
-use orbtk::Entity;

 pub struct RectangleBuilder {}

--- a/src/widget_builders/textedit.rs
+++ b/src/widget_builders/textedit.rs
@ -4,7 +4,7 @@ use crate::state;
 use crate::widget_builders::{QmlContext, WidgetBuilder};
 use orbtk::prelude::HashMap;
 use orbtk::prelude::*;
-use orbtk::Entity;
+

 pub struct TextEditBuilder {}

@ -35,7 +35,7 @@ impl WidgetBuilder for TextEditBuilder {
                _ => String::new(),
            };

-            tt = tt.on_changed(move |states, _entity: Entity| {
+            tt = tt.on_changed(move |states, _entity: Entity,_| {
                state(id, states).action(code.clone());
            });

--- a/src/widget_builders/textfield.rs
+++ b/src/widget_builders/textfield.rs
@ -3,7 +3,6 @@ use crate::parser::{Value, QML};
 use crate::widget_builders::{QmlContext, WidgetBuilder};
 use orbtk::prelude::HashMap;
 use orbtk::prelude::*;
-use orbtk::Entity;

 pub struct TextBuilder {}