diff --git a/calculator/Cargo.toml b/calculator/Cargo.toml index 77c1adaf0cef5bc08279d1bd59f99acb80dc4022..675c3218e17032e06f6c5284bb83278d98ccffdb 100644 --- a/calculator/Cargo.toml +++ b/calculator/Cargo.toml @@ -14,10 +14,12 @@ path = "src/main.rs" [dependencies] calculate = { git = "https://gitlab.redox-os.org/redox-os/calc.git" } +slint = { git = "https://github.com/slint-ui/slint", tag="v0.3.3", default-features = false, features = ["compat-0-3-0", "std", "renderer-winit-software"] } -slint = { version = "0.3.2", default-features = false, features = ["compat-0-3-0"] } -slint_orbclient = { git = "https://gitlab.redox-os.org/redox-os/slint_orbclient.git" } +[patch.crates-io] +winit = { git = "https://gitlab.redox-os.org/redox-os/winit", branch = "redox-0.27" } [build-dependencies] -slint-build = "0.3.2" +slint-build = { git = "https://github.com/slint-ui/slint", tag="v0.3.3" } coop_widgets = { git = "https://codeberg.org/flovansl/co_sl" } + diff --git a/calculator/src/main.rs b/calculator/src/main.rs index da8e79ab8baf9d77bb4875025d265d526a74fd9e..d81ad2a6daac27b05944a494ca1a1ce660363a4e 100644 --- a/calculator/src/main.rs +++ b/calculator/src/main.rs @@ -13,15 +13,7 @@ fn eval(input: &str) -> String { } pub fn main() { - slint_orbclient::init_config( - slint_orbclient::Config::default() - .width(200) - .height(220) - .title("Calculator"), - ); - let app = App::new(); - app.global::<coop>().set_embedded_helper(true); app.on_backspace(|input| { let mut input = input.to_string();