slint-ui 1.13.0-nightly.2025063021 → 1.13.0-nightly.2025070221
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.toml +4 -4
- package/package.json +7 -7
- package/rust/interpreter/value.rs +11 -2
package/Cargo.toml
CHANGED
|
@@ -42,10 +42,10 @@ accessibility = ["slint-interpreter/accessibility"]
|
|
|
42
42
|
[dependencies]
|
|
43
43
|
napi = { version = "2.14.0", default-features = false, features = ["napi8"] }
|
|
44
44
|
napi-derive = "2.14.0"
|
|
45
|
-
i-slint-compiler = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "
|
|
46
|
-
i-slint-core = { features = ["default", "gettext-rs"] , git = "https://github.com/slint-ui/slint", rev = "
|
|
47
|
-
i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "
|
|
48
|
-
slint-interpreter = { default-features = false , features = ["display-diagnostics", "internal", "compat-1-2"] , git = "https://github.com/slint-ui/slint", rev = "
|
|
45
|
+
i-slint-compiler = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "5a653d7f32d2a8efac5cef56def258f952b0a304", version = "=1.13.0", default-features = false }
|
|
46
|
+
i-slint-core = { features = ["default", "gettext-rs"] , git = "https://github.com/slint-ui/slint", rev = "5a653d7f32d2a8efac5cef56def258f952b0a304", version = "=1.13.0", default-features = false }
|
|
47
|
+
i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "5a653d7f32d2a8efac5cef56def258f952b0a304", version = "=1.13.0", default-features = false }
|
|
48
|
+
slint-interpreter = { default-features = false , features = ["display-diagnostics", "internal", "compat-1-2"] , git = "https://github.com/slint-ui/slint", rev = "5a653d7f32d2a8efac5cef56def258f952b0a304", version = "=1.13.0"}
|
|
49
49
|
spin_on = { version = "0.1" }
|
|
50
50
|
css-color-parser2 = { version = "1.0.1" }
|
|
51
51
|
itertools = { version = "0.14" }
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "slint-ui",
|
|
3
|
-
"version": "1.13.0-nightly.
|
|
3
|
+
"version": "1.13.0-nightly.2025070221",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"homepage": "https://github.com/slint-ui/slint",
|
|
@@ -66,11 +66,11 @@
|
|
|
66
66
|
"@napi-rs/cli": "2.18.4"
|
|
67
67
|
},
|
|
68
68
|
"optionalDependencies": {
|
|
69
|
-
"@slint-ui/slint-ui-binary-linux-x64-gnu": "1.13.0-nightly.
|
|
70
|
-
"@slint-ui/slint-ui-binary-linux-arm64-gnu": "1.13.0-nightly.
|
|
71
|
-
"@slint-ui/slint-ui-binary-darwin-x64": "1.13.0-nightly.
|
|
72
|
-
"@slint-ui/slint-ui-binary-darwin-arm64": "1.13.0-nightly.
|
|
73
|
-
"@slint-ui/slint-ui-binary-win32-x64-msvc": "1.13.0-nightly.
|
|
74
|
-
"@slint-ui/slint-ui-binary-win32-arm64-msvc": "1.13.0-nightly.
|
|
69
|
+
"@slint-ui/slint-ui-binary-linux-x64-gnu": "1.13.0-nightly.2025070221",
|
|
70
|
+
"@slint-ui/slint-ui-binary-linux-arm64-gnu": "1.13.0-nightly.2025070221",
|
|
71
|
+
"@slint-ui/slint-ui-binary-darwin-x64": "1.13.0-nightly.2025070221",
|
|
72
|
+
"@slint-ui/slint-ui-binary-darwin-arm64": "1.13.0-nightly.2025070221",
|
|
73
|
+
"@slint-ui/slint-ui-binary-win32-x64-msvc": "1.13.0-nightly.2025070221",
|
|
74
|
+
"@slint-ui/slint-ui-binary-win32-arm64-msvc": "1.13.0-nightly.2025070221"
|
|
75
75
|
}
|
|
76
76
|
}
|
|
@@ -112,8 +112,17 @@ pub fn to_value(env: &Env, unknown: JsUnknown, typ: &Type) -> Result<Value> {
|
|
|
112
112
|
return unknown.coerce_to_string().and_then(string_to_brush)
|
|
113
113
|
}
|
|
114
114
|
Ok(ValueType::Object) => {
|
|
115
|
-
if let Ok(
|
|
116
|
-
|
|
115
|
+
if let Ok(rgb_color_or_brush) = unknown.coerce_to_object() {
|
|
116
|
+
if let Some(direct_brush) =
|
|
117
|
+
rgb_color_or_brush.get("brush").ok().flatten().and_then(
|
|
118
|
+
|maybe_slintbrush| {
|
|
119
|
+
env.get_value_external::<Brush>(&maybe_slintbrush).ok()
|
|
120
|
+
},
|
|
121
|
+
)
|
|
122
|
+
{
|
|
123
|
+
return Ok(Value::Brush(direct_brush.color().into()));
|
|
124
|
+
}
|
|
125
|
+
return brush_from_color(rgb_color_or_brush);
|
|
117
126
|
}
|
|
118
127
|
}
|
|
119
128
|
_ => {}
|