Commit 990fcfc9 authored by Florian Blasius's avatar Florian Blasius 🤘

fixes

parent bc94174c
......@@ -150,14 +150,6 @@ dependencies = [
"fxhash",
]
[[package]]
name = "dces"
version = "0.3.1"
source = "git+https://gitlab.redox-os.org/redox-os/dces-rust.git?branch=develop#f85e608e74105a8822294f55c823b89c4047a6f5"
dependencies = [
"fxhash",
]
[[package]]
name = "deflate"
version = "0.7.20"
......@@ -474,7 +466,7 @@ dependencies = [
name = "orbtk"
version = "0.3.1-alpha4"
dependencies = [
"dces 0.3.1 (git+https://gitlab.redox-os.org/redox-os/dces-rust.git?branch=develop)",
"dces",
"euc",
"orbtk_api",
"orbtk_localization",
......@@ -497,7 +489,7 @@ dependencies = [
name = "orbtk_api"
version = "0.3.1-alpha4"
dependencies = [
"dces 0.3.1 (git+https://gitlab.redox-os.org/redox-os/dces-rust.git?branch=before_resource)",
"dces",
"derive_more",
"dirs-next",
"memchr",
......@@ -603,7 +595,7 @@ dependencies = [
name = "orbtk_tree"
version = "0.3.1-alpha4"
dependencies = [
"dces 0.3.1 (git+https://gitlab.redox-os.org/redox-os/dces-rust.git?branch=before_resource)",
"dces",
]
[[package]]
......@@ -622,7 +614,7 @@ dependencies = [
name = "orbtk_widgets"
version = "0.3.1-alpha4"
dependencies = [
"dces 0.3.1 (git+https://gitlab.redox-os.org/redox-os/dces-rust.git?branch=before_resource)",
"dces",
"lazy_static",
"orbtk_api",
"orbtk_proc_macros",
......
......@@ -37,7 +37,7 @@ orbtk_theming = { version = "0.3.1-alpha4", path="crates/theming" }
orbtk_utils = { version = "0.3.1-alpha4", path = "crates/utils" }
orbtk_tree = { version = "0.3.1-alpha4", path="crates/tree" }
orbtk_widgets = { version = "0.3.1-alpha4", path="crates/widgets", default-features = false }
dces = { git = "https://gitlab.redox-os.org/redox-os/dces-rust.git", branch = "develop" }
dces = { git = "https://gitlab.redox-os.org/redox-os/dces-rust.git", branch = "before_resource" }
[dev-dependencies]
euc = "0.5.0"
......
......@@ -363,11 +363,9 @@ where
pub fn render(&mut self) {
if self.redraw.load(Ordering::Relaxed) {
let bytes = self.render_context.data_u8_mut();
let len = bytes.len() / std::mem::size_of::<orbclient::Color>();
let color_data = unsafe {
std::slice::from_raw_parts_mut(
bytes.as_mut_ptr() as *mut orbclient::Color,
bytes.len() / std::mem::size_of::<orbclient::Color>(),
)
std::slice::from_raw_parts_mut(bytes.as_mut_ptr() as *mut orbclient::Color, len)
};
if color_data.len() == self.window.data().len() {
......
......@@ -643,7 +643,6 @@ impl TextBehaviorState {
if *TextBehavior::focused_ref(&ctx.widget()) {
self.update_focused_state(ctx);
return;
}
}
......
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