Commit 445ea01c authored by Florian Blasius's avatar Florian Blasius 🤘

OrbTk update.

parent 9b11742d
Pipeline #6544 failed with stages
in 19 minutes and 25 seconds
......@@ -15,6 +15,12 @@ dependencies = [
"num-traits",
]
[[package]]
name = "arrayref"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
[[package]]
name = "arrayvec"
version = "0.4.12"
......@@ -36,6 +42,28 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
[[package]]
name = "backtrace"
version = "0.3.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
dependencies = [
"backtrace-sys",
"cfg-if",
"libc",
"rustc-demangle",
]
[[package]]
name = "backtrace-sys"
version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "base-x"
version = "0.2.6"
......@@ -57,6 +85,17 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "blake2b_simd"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
dependencies = [
"arrayref",
"arrayvec 0.5.1",
"constant_time_eq",
]
[[package]]
name = "bumpalo"
version = "2.6.0"
......@@ -71,9 +110,12 @@ checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
[[package]]
name = "cast"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427"
checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
dependencies = [
"rustc_version",
]
[[package]]
name = "cc"
......@@ -102,6 +144,12 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
[[package]]
name = "constant_time_eq"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
[[package]]
name = "crc32fast"
version = "1.2.0"
......@@ -137,11 +185,11 @@ dependencies = [
[[package]]
name = "crossbeam-queue"
version = "0.1.2"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
checksum = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700"
dependencies = [
"crossbeam-utils 0.6.6",
"crossbeam-utils 0.7.0",
]
[[package]]
......@@ -207,6 +255,28 @@ dependencies = [
"byteorder",
]
[[package]]
name = "dirs"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
dependencies = [
"cfg-if",
"dirs-sys",
]
[[package]]
name = "dirs-sys"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
dependencies = [
"cfg-if",
"libc",
"redox_users",
"winapi",
]
[[package]]
name = "discard"
version = "1.0.4"
......@@ -221,13 +291,35 @@ checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
[[package]]
name = "euclid"
version = "0.20.3"
version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f46a3516f04c5e05870f71ae6242a97e8f72ee12cfc2f7f5deb16111a98b0670"
checksum = "4eeaa189ab5e5b393b765ff1ca754d88f3180d16260f1a5b39156c7b16159cce"
dependencies = [
"num-traits",
]
[[package]]
name = "failure"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
dependencies = [
"backtrace",
"failure_derive",
]
[[package]]
name = "failure_derive"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
dependencies = [
"proc-macro2 1.0.6",
"quote 1.0.2",
"syn 1.0.8",
"synstructure",
]
[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
......@@ -443,9 +535,9 @@ dependencies = [
[[package]]
name = "num-traits"
version = "0.2.9"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "443c53b3c3531dfcbfa499d8893944db78474ad7a1d87fa2d94d1a2231693ac6"
checksum = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
dependencies = [
"autocfg",
]
......@@ -511,7 +603,7 @@ dependencies = [
[[package]]
name = "orbtk"
version = "0.3.1-alpha1"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#2959915228dbf3e982af04723c106a6cc4257b9a"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#8da0e20247e84c6e00986b319cfc0866d896a196"
dependencies = [
"dces",
"orbtk-api",
......@@ -528,21 +620,25 @@ dependencies = [
[[package]]
name = "orbtk-api"
version = "0.3.1-alpha2"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#2959915228dbf3e982af04723c106a6cc4257b9a"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#8da0e20247e84c6e00986b319cfc0866d896a196"
dependencies = [
"dces",
"dirs",
"orbtk-css-engine",
"orbtk-render",
"orbtk-shell",
"orbtk-theme",
"orbtk-tree",
"orbtk-utils",
"ron",
"serde",
"serde_derive",
]
[[package]]
name = "orbtk-css-engine"
version = "0.3.1-alpha2"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#2959915228dbf3e982af04723c106a6cc4257b9a"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#8da0e20247e84c6e00986b319cfc0866d896a196"
dependencies = [
"cssparser",
"orbtk-utils",
......@@ -551,7 +647,7 @@ dependencies = [
[[package]]
name = "orbtk-proc-macros"
version = "0.3.1-alpha2"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#2959915228dbf3e982af04723c106a6cc4257b9a"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#8da0e20247e84c6e00986b319cfc0866d896a196"
dependencies = [
"quote 1.0.2",
"syn 1.0.8",
......@@ -560,7 +656,7 @@ dependencies = [
[[package]]
name = "orbtk-render"
version = "0.3.1-alpha2"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#2959915228dbf3e982af04723c106a6cc4257b9a"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#8da0e20247e84c6e00986b319cfc0866d896a196"
dependencies = [
"image",
"orbtk-utils",
......@@ -572,7 +668,7 @@ dependencies = [
[[package]]
name = "orbtk-shell"
version = "0.3.1-alpha2"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#2959915228dbf3e982af04723c106a6cc4257b9a"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#8da0e20247e84c6e00986b319cfc0866d896a196"
dependencies = [
"image",
"lazy_static",
......@@ -587,7 +683,7 @@ dependencies = [
[[package]]
name = "orbtk-theme"
version = "0.3.1-alpha2"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#2959915228dbf3e982af04723c106a6cc4257b9a"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#8da0e20247e84c6e00986b319cfc0866d896a196"
dependencies = [
"lazy_static",
"orbtk-css-engine",
......@@ -596,7 +692,7 @@ dependencies = [
[[package]]
name = "orbtk-tree"
version = "0.3.1-alpha2"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#2959915228dbf3e982af04723c106a6cc4257b9a"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#8da0e20247e84c6e00986b319cfc0866d896a196"
dependencies = [
"dces",
]
......@@ -604,12 +700,12 @@ dependencies = [
[[package]]
name = "orbtk-utils"
version = "0.3.1-alpha2"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#2959915228dbf3e982af04723c106a6cc4257b9a"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#8da0e20247e84c6e00986b319cfc0866d896a196"
[[package]]
name = "orbtk-widgets"
version = "0.3.1-alpha2"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#2959915228dbf3e982af04723c106a6cc4257b9a"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk.git?branch=develop#8da0e20247e84c6e00986b319cfc0866d896a196"
dependencies = [
"dces",
"orbtk-api",
......@@ -674,9 +770,9 @@ checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
[[package]]
name = "png"
version = "0.15.0"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8422b27bb2c013dd97b9aef69e161ce262236f49aaf46a0489011c8ff0264602"
checksum = "1f00ec9242f8e01119e83117dbadf34c5228ac2f1c4ddcd92bffa340d52291de"
dependencies = [
"bitflags",
"crc32fast",
......@@ -853,9 +949,9 @@ dependencies = [
[[package]]
name = "rayon"
version = "1.2.0"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123"
checksum = "43739f8831493b276363637423d3622d4bd6394ab6f0a9c4a552e208aeb7fddd"
dependencies = [
"crossbeam-deque",
"either",
......@@ -864,13 +960,13 @@ dependencies = [
[[package]]
name = "rayon-core"
version = "1.6.0"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b"
checksum = "f8bf17de6f23b05473c437eb958b9c850bfc8af0961fe17b4cc92d5a627b4791"
dependencies = [
"crossbeam-deque",
"crossbeam-queue",
"crossbeam-utils 0.6.6",
"crossbeam-utils 0.7.0",
"lazy_static",
"num_cpus",
]
......@@ -890,6 +986,18 @@ version = "0.1.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
[[package]]
name = "redox_users"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
dependencies = [
"failure",
"rand_os",
"redox_syscall",
"rust-argon2",
]
[[package]]
name = "ron"
version = "0.5.1"
......@@ -901,6 +1009,23 @@ dependencies = [
"serde",
]
[[package]]
name = "rust-argon2"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
dependencies = [
"base64",
"blake2b_simd",
"crossbeam-utils 0.6.6",
]
[[package]]
name = "rustc-demangle"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
[[package]]
name = "rustc_version"
version = "0.2.3"
......@@ -912,9 +1037,9 @@ dependencies = [
[[package]]
name = "rusttype"
version = "0.8.1"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fa38506b5cbf2fb67f915e2725cb5012f1b9a785b0ab55c4733acda5f6554ef"
checksum = "14a911032fb5791ccbeec9f28fdcb9bf0983b81f227bafdfd227c658d0731c8a"
dependencies = [
"approx",
"arrayvec 0.5.1",
......@@ -1034,9 +1159,9 @@ dependencies = [
[[package]]
name = "stb_truetype"
version = "0.3.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "824210d6fb52cbc3ad2545270ead6860c7311aa5450642b078da4515937b6f7a"
checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
dependencies = [
"byteorder",
]
......@@ -1140,6 +1265,18 @@ dependencies = [
"unicode-xid 0.0.4",
]
[[package]]
name = "synstructure"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
dependencies = [
"proc-macro2 1.0.6",
"quote 1.0.2",
"syn 1.0.8",
"unicode-xid 0.2.0",
]
[[package]]
name = "tiff"
version = "0.3.1"
......@@ -1198,9 +1335,9 @@ checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
[[package]]
name = "wasm-bindgen"
version = "0.2.54"
version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4568ae1b4e07ca907b1a4de41174eaa3e5be4066c024475586b7842725f69a9"
checksum = "29ae32af33bacd663a9a28241abecf01f2be64e6a185c6139b04f18b6385c5f2"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
......@@ -1208,9 +1345,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.54"
version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a00cfdce37367770062065fd3abb9278cbae86a0d918cacd0978a7acd51b481"
checksum = "1845584bd3593442dc0de6e6d9f84454a59a057722f36f005e44665d6ab19d85"
dependencies = [
"bumpalo",
"lazy_static",
......@@ -1223,9 +1360,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.54"
version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c568f4d3cf6d7c1d72b165daf778fb0d6e09a24f96ac14fc8c4f66a96e86b72"
checksum = "87fcc747e6b73c93d22c947a6334644d22cfec5abd8b66238484dc2b0aeb9fe4"
dependencies = [
"quote 1.0.2",
"wasm-bindgen-macro-support",
......@@ -1233,9 +1370,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.54"
version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "430d12539ae324d16097b399e9d07a6d5ce0173b2a61a2d02346ca7c198daffe"
checksum = "3dc4b3f2c4078c8c4a5f363b92fcf62604c5913cbd16c6ff5aaf0f74ec03f570"
dependencies = [
"proc-macro2 1.0.6",
"quote 1.0.2",
......@@ -1246,9 +1383,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.54"
version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ae7167f0bbffd7fac2b12da0fa1f834c1d84671a1ae3c93ac8bde2e97179c39"
checksum = "ca0b78d6d3be8589b95d1d49cdc0794728ca734adf36d7c9f07e6459508bb53d"
[[package]]
name = "winapi"
......
......@@ -30,12 +30,12 @@ impl MapViewState {
}
impl State for MapViewState {
fn init(&self, ctx: &mut Context<'_>) {
fn init(&self, _: &mut Registry, ctx: &mut Context<'_>) {
// workaround
ctx.window().get_mut::<Global>("global").focused_widget = Some(ctx.entity);
}
fn update(&self, ctx: &mut Context<'_>) {
fn update(&self, _: &mut Registry, ctx: &mut Context<'_>) {
if let Some(action) = self.action.get() {
if let Some(window_id) = ctx.parent_entity_by_element("window") {
match action {
......@@ -118,7 +118,7 @@ impl MenuViewState {
}
impl State for MenuViewState {
fn update(&self, ctx: &mut Context<'_>) {
fn update(&self, _: &mut Registry, ctx: &mut Context<'_>) {
if let Some(action) = self.action.get() {
if let Some(window_id) = ctx.parent_entity_by_element("window") {
match action {
......@@ -242,7 +242,7 @@ impl GameViewState {
}
impl State for GameViewState {
fn update(&self, ctx: &mut Context<'_>) {
fn update(&self, _: &mut Registry, ctx: &mut Context<'_>) {
if let Some(event) = self.event.get() {
match event {
GameEvent::OpenMenu => {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment