Skip to content
GitLab
Commit 34baf83f authored by Florian Blasius's avatar Florian Blasius
Browse files

OrbTk update.

parent a4cca342
Pipeline #4196 failed with stage
in 1 minute and 33 seconds
Hide whitespace changes
Inline Side-by-side
Cargo.lock
View file @ 34baf83f
......@@ -108,6 +108,11 @@ dependencies = [
"constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "bumpalo"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "bytecount"
version = "0.1.7"
......@@ -741,7 +746,7 @@ dependencies = [
[[package]]
name = "orbclient"
version = "0.3.21"
version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -753,7 +758,7 @@ name = "orbfont"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"orbclient 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
"rusttype 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
......@@ -763,7 +768,7 @@ version = "0.1.9"
source = "git+https://gitlab.redox-os.org/redox-os/orbfont#9e624358518925e75bc5af94a2369e981379002a"
dependencies = [
"font-loader 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
"rusttype 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
......@@ -772,10 +777,10 @@ name = "orbgl"
version = "0.1.0"
source = "git+https://gitlab.redox-os.org/redox-os/orbgl.git#715fc579acf3cc2b449bf54f5cf3e4667bd82a93"
dependencies = [
"orbclient 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
"orbgl_api 0.1.0 (git+https://gitlab.redox-os.org/redox-os/orbgl.git)",
"rust-cairo 0.1.0 (git+https://gitlab.redox-os.org/redox-os/rust-cairo.git)",
"stdweb 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
......@@ -783,20 +788,10 @@ name = "orbgl_api"
version = "0.1.0"
source = "git+https://gitlab.redox-os.org/redox-os/orbgl.git#715fc579acf3cc2b449bf54f5cf3e4667bd82a93"
dependencies = [
"orbclient 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
"orbfont 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"orbimage 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "orbgl_shapes"
version = "0.1.0"
source = "git+https://gitlab.redox-os.org/redox-os/orbgl.git#715fc579acf3cc2b449bf54f5cf3e4667bd82a93"
dependencies = [
"orbclient 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
"orbgl_api 0.1.0 (git+https://gitlab.redox-os.org/redox-os/orbgl.git)",
"stdweb 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
......@@ -805,24 +800,56 @@ version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
"resize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "orbtk"
version = "0.3.0"
source = "git+https://gitlab.redox-os.org/redox-os/orbtk#1474ea1c13a5d9d88460a6b97268a2ff1ea91a60"
dependencies = [
"cssparser 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dces 0.1.6 (git+https://gitlab.redox-os.org/redox-os/dces-rust.git)",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
"orbfont 0.1.9 (git+https://gitlab.redox-os.org/redox-os/orbfont)",
"orbgl 0.1.0 (git+https://gitlab.redox-os.org/redox-os/orbgl.git)",
"orbgl_api 0.1.0 (git+https://gitlab.redox-os.org/redox-os/orbgl.git)",
"orbgl_shapes 0.1.0 (git+https://gitlab.redox-os.org/redox-os/orbgl.git)",
"orbimage 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"orbtk-css-engine 0.1.0",
"orbtk-theme 0.1.0",
"orbtk-tree 0.1.0",
"orbtk-utils 0.1.0",
]
[[package]]
name = "orbtk-css-engine"
version = "0.1.0"
dependencies = [
"cssparser 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
"orbtk-utils 0.1.0",
]
[[package]]
name = "orbtk-theme"
version = "0.1.0"
dependencies = [
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"orbfont 0.1.9 (git+https://gitlab.redox-os.org/redox-os/orbfont)",
"orbtk-css-engine 0.1.0",
]
[[package]]
name = "orbtk-tree"
version = "0.1.0"
dependencies = [
"dces 0.1.6 (git+https://gitlab.redox-os.org/redox-os/dces-rust.git)",
]
[[package]]
name = "orbtk-utils"
version = "0.1.0"
dependencies = [
"orbgl_api 0.1.0 (git+https://gitlab.redox-os.org/redox-os/orbgl.git)",
]
[[package]]
......@@ -837,10 +864,10 @@ dependencies = [
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
"mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
"orbclient 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
"orbfont 0.1.9 (git+https://gitlab.redox-os.org/redox-os/orbfont)",
"orbimage 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"orbtk 0.3.0 (git+https://gitlab.redox-os.org/redox-os/orbtk)",
"orbtk 0.3.0",
"redox_event 0.1.0 (git+https://gitlab.redox-os.org/redox-os/event.git)",
"redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -1350,7 +1377,7 @@ dependencies = [
[[package]]
name = "stdweb"
version = "0.4.15"
version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -1358,8 +1385,9 @@ dependencies = [
"serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb-derive 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb-internal-macros 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb-internal-macros 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb-internal-runtime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"wasm-bindgen 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
......@@ -1376,7 +1404,7 @@ dependencies = [
[[package]]
name = "stdweb-internal-macros"
version = "0.2.6"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"base-x 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -1638,6 +1666,54 @@ name = "void"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "wasm-bindgen"
version = "0.2.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"wasm-bindgen-macro 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bumpalo 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
"wasm-bindgen-shared 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
"wasm-bindgen-macro-support 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
"wasm-bindgen-backend 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
"wasm-bindgen-shared 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "webpki"
version = "0.18.1"
......@@ -1705,6 +1781,7 @@ source = "git+https://github.com/robbycerantola/jpeg-decoder.git#fded71064bc8133
"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
"checksum bumpalo 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4639720be048090544634e0402490838995ccdc9d2fe648f528f30d3c33ae71f"
"checksum bytecount 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4bbeb7c30341fce29f6078b4bdf876ea4779600866e98f5b2d203a534f195050"
"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
"checksum calculate 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dfe3fe310e5858ba47beb9443acec7fb39b90ea5677d35636306fe7b495a547c"
......@@ -1781,14 +1858,12 @@ source = "git+https://github.com/robbycerantola/jpeg-decoder.git#fded71064bc8133
"checksum num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e96f040177bb3da242b5b1ecf3f54b5d5af3efbbfb18608977a5d2767b22f10"
"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
"checksum orbclient 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc3cb6a2e27e7635ffb7333ce0d32f1bb4f1735979ce6dacc647b1122c86e53"
"checksum orbclient 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0e398a001ca5f52b252d1cf5679d52ddd347d3130ac9ded98549f16537c546"
"checksum orbfont 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "da4dfbc851e5c24c3cf1e16ec5222f868f3362d2b7493d0b53051fe2669267a2"
"checksum orbfont 0.1.9 (git+https://gitlab.redox-os.org/redox-os/orbfont)" = "<none>"
"checksum orbgl 0.1.0 (git+https://gitlab.redox-os.org/redox-os/orbgl.git)" = "<none>"
"checksum orbgl_api 0.1.0 (git+https://gitlab.redox-os.org/redox-os/orbgl.git)" = "<none>"
"checksum orbgl_shapes 0.1.0 (git+https://gitlab.redox-os.org/redox-os/orbgl.git)" = "<none>"
"checksum orbimage 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "39fe3f9612b797a312bf122a67ebce408936b34996b9be419dbf0b3d4638c424"
"checksum orbtk 0.3.0 (git+https://gitlab.redox-os.org/redox-os/orbtk)" = "<none>"
"checksum ord_subset 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d7ce14664caf5b27f5656ff727defd68ae1eb75ef3c4d95259361df1eb376bef"
"checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
......@@ -1852,9 +1927,9 @@ source = "git+https://github.com/robbycerantola/jpeg-decoder.git#fded71064bc8133
"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
"checksum stb_truetype 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "69b7df505db8e81d54ff8be4693421e5b543e08214bd8d99eb761fcb4d5668ba"
"checksum stdweb 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a3edad410e603184d656e2abded5fd4d3d6e93d5763d21130dbaf99795db74eb"
"checksum stdweb 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c34362bb10ac1a9439674795cc0e1bdcb0c46444c8fd4874ef39a01d9a8a8f24"
"checksum stdweb-derive 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e21ebd9179de08f2300a65454268a17ea3de204627458588c84319c4def3930"
"checksum stdweb-internal-macros 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1635afd059cbfac7d5b1274f0c44cec110c1e013c48e8bbc22e07e52696cf887"
"checksum stdweb-internal-macros 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "e68f7d08b76979a43e93fe043b66d2626e35d41d68b0b85519202c6dd8ac59fa"
"checksum stdweb-internal-runtime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a2a2f4a2eb556337b2d1a302630bbddf989ae383c70393e89b48152b9896cbda"
"checksum string_cache 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7c8ba7515dd502b75080d989b819d31fb72686a82320d8006f665003c42ef79"
"checksum string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da"
......@@ -1887,6 +1962,11 @@ source = "git+https://github.com/robbycerantola/jpeg-decoder.git#fded71064bc8133
"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
"checksum wasm-bindgen 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "546e4ab1bf7f9a3532d21472efd72d01a23f55abd885c60b165f393394dbad95"
"checksum wasm-bindgen-backend 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "7b84bedebfd6ae3522cce59dec6b52ee6c53ceeaae8541668c15b9f42df8ecab"
"checksum wasm-bindgen-macro 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "f2a033fc6bfd5e486a488b0e19d7d1bb29e667ebb91db85f698381a8aa831786"
"checksum wasm-bindgen-macro-support 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "fba68375ef8f095c4a169c093c95ed2e1b5e44f7872f3bcbcafe2c51b4a80480"
"checksum wasm-bindgen-shared 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "321949f4d7f7bf7a49dccd464bdc46581b180f761d9505e4943926d50b2a4a64"
"checksum webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "17d7967316d8411ca3b01821ee6c332bde138ba4363becdb492f12e514daa17f"
"checksum webpki-roots 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85d1f408918fd590908a70d36b7ac388db2edc221470333e4d6e5b598e44cabf"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
......
Cargo.toml
View file @ 34baf83f
......@@ -57,8 +57,8 @@ mime = "0.2"
orbclient = "0.3.20"
orbfont = { git = "https://gitlab.redox-os.org/redox-os/orbfont" }
orbimage = "0.1"
# orbtk = { path = "../orbtk" }
orbtk = { git = "https://gitlab.redox-os.org/redox-os/orbtk" }
orbtk = { path = "../orbtk" }
# orbtk = { git = "https://gitlab.redox-os.org/redox-os/orbtk" }
tendril = "0.4"
url = "1.5"
redox_users = "0.2"
......
src/calculator/main.rs
View file @ 34baf83f
extern crate orbtk;
use orbtk::prelude::*;
use orbtk::theme::DEFAULT_THEME_CSS;
extern crate calc;
......@@ -11,13 +12,13 @@ static DARK_EXT: &'static str = include_str!("dark-ext.css");
static LIGHT_EXT: &'static str = include_str!("light-ext.css");
#[cfg(not(feature = "light-theme"))]
fn get_theme() -> Theme {
Theme::create().extension_css(DARK_EXT).build()
fn get_theme() -> ThemeValue {
ThemeValue::create_from_css(DEFAULT_THEME_CSS).extension_css(DARK_EXT).build()
}
#[cfg(feature = "light-theme")]
fn get_theme() -> Theme {
Theme::create_light_theme()
fn get_theme() -> ThemeValue {
ThemeValue::create_light_theme()
.extension_css(DARK_EXT)
.extension_css(LIGHT_EXT)
.build()
......@@ -259,14 +260,15 @@ impl Template for MainView {
}
fn main() {
let mut application = Application::new();
application
.create_window()
.bounds((0.0, 0.0, 220.0, 344.0))
.title("Calculator")
.theme(get_theme())
.debug_flag(false)
.build(MainView::create());
application.run();
Application::new()
.window(|ctx| {
Window::create()
.title("Calculator")
.position((100.0, 100.0))
.size(220.0, 344.0)
.theme(get_theme())
.child(MainView::create().build(ctx))
.build(ctx)
})
.run();
}
Supports Markdown
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