diff --git a/Cargo.toml b/Cargo.toml index bb61063..9b912d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "raui" -version = "0.64.1" +version = "0.64.2" authors = ["Patryk 'PsichiX' Budzynski "] edition = "2021" description = "Renderer Agnostic User Interface" diff --git a/raui-app/Cargo.toml b/raui-app/Cargo.toml index 3a5e3bb..615f009 100644 --- a/raui-app/Cargo.toml +++ b/raui-app/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "raui-app" -version = "0.64.1" +version = "0.64.2" authors = ["Patryk 'PsichiX' Budzynski "] edition = "2021" description = "RAUI application layer to focus only on making UI" diff --git a/raui-core/Cargo.toml b/raui-core/Cargo.toml index 2ff581a..669bb98 100644 --- a/raui-core/Cargo.toml +++ b/raui-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "raui-core" -version = "0.64.1" +version = "0.64.2" authors = ["Patryk 'PsichiX' Budzynski "] edition = "2021" description = "RAUI application layer" @@ -14,4 +14,4 @@ categories = ["gui", "rendering::graphics-api"] raui-derive = { version = "0.64", path = "../raui-derive" } serde = { version = "1", features = ["derive"] } serde_json = "1.0" -intuicio-data = "0.39" +intuicio-data = "0.44" diff --git a/raui-core/src/widget/mod.rs b/raui-core/src/widget/mod.rs index 16f5b93..400c16f 100644 --- a/raui-core/src/widget/mod.rs +++ b/raui-core/src/widget/mod.rs @@ -126,18 +126,18 @@ impl WidgetId { if path.is_empty() { return Self { id: format!("{}:", type_name), - type_name: 0..type_name.as_bytes().len(), + type_name: 0..type_name.len(), parts: Default::default(), }; } - let count = type_name.as_bytes().len() + let count = type_name.len() + b":".len() - + path.iter().map(|part| part.as_bytes().len()).sum::() + + path.iter().map(|part| part.len()).sum::() + path.len().saturating_sub(1) * b"/".len(); let mut result = String::with_capacity(count); - let mut position = result.as_bytes().len(); + let mut position = result.len(); result.push_str(type_name); - let type_name = 0..result.as_bytes().len(); + let type_name = 0..result.len(); result.push(':'); let parts = path .iter() @@ -146,9 +146,9 @@ impl WidgetId { if index > 0 { result.push('/'); } - position = result.as_bytes().len(); + position = result.len(); result.push_str(part); - let range = position..result.as_bytes().len(); + let range = position..result.len(); if let Some(index) = part.find('?') { let key = range.start..(range.start + index); let meta = (range.start + index + b"?".len())..range.end; @@ -167,15 +167,15 @@ impl WidgetId { } pub fn push(&self, part: &str) -> Self { - let count = self.id.as_bytes().len() + b"/".len(); + let count = self.id.len() + b"/".len(); let mut result = String::with_capacity(count); result.push_str(&self.id); if self.depth() > 0 { result.push('/'); } - let position = result.as_bytes().len(); + let position = result.len(); result.push_str(part); - let range = position..result.as_bytes().len(); + let range = position..result.len(); let (key, meta) = if let Some(index) = part.find('?') { let key = range.start..(range.start + index); let meta = (range.start + index + b"?".len())..range.end; diff --git a/raui-derive/Cargo.toml b/raui-derive/Cargo.toml index 41badb9..cf6cabf 100644 --- a/raui-derive/Cargo.toml +++ b/raui-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "raui-derive" -version = "0.64.1" +version = "0.64.2" authors = ["Patryk 'PsichiX' Budzynski "] edition = "2021" description = "Macros for Renderer Agnostic User Interface" diff --git a/raui-immediate-widgets/Cargo.toml b/raui-immediate-widgets/Cargo.toml index 67a4ff4..d1482b8 100644 --- a/raui-immediate-widgets/Cargo.toml +++ b/raui-immediate-widgets/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "raui-immediate-widgets" -version = "0.64.1" +version = "0.64.2" authors = ["Patryk 'PsichiX' Budzynski "] edition = "2021" description = "Widgets library for RAUI immediate mode UI layer" diff --git a/raui-immediate/Cargo.toml b/raui-immediate/Cargo.toml index 614ce10..96e23bc 100644 --- a/raui-immediate/Cargo.toml +++ b/raui-immediate/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "raui-immediate" -version = "0.64.1" +version = "0.64.2" authors = ["Patryk 'PsichiX' Budzynski "] edition = "2021" description = "RAUI immediate mode UI layer" diff --git a/raui-json-renderer/Cargo.toml b/raui-json-renderer/Cargo.toml index c49ad29..a938dc6 100644 --- a/raui-json-renderer/Cargo.toml +++ b/raui-json-renderer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "raui-json-renderer" -version = "0.64.1" +version = "0.64.2" authors = ["Patryk 'PsichiX' Budzynski "] edition = "2021" description = "RAUI renderer for JSON format" diff --git a/raui-material/Cargo.toml b/raui-material/Cargo.toml index 3b06172..c204825 100644 --- a/raui-material/Cargo.toml +++ b/raui-material/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "raui-material" -version = "0.64.1" +version = "0.64.2" authors = ["Patryk 'PsichiX' Budzynski "] edition = "2021" description = "Material components library for RAUI" diff --git a/raui-retained/Cargo.toml b/raui-retained/Cargo.toml index 72665c9..28c8d4c 100644 --- a/raui-retained/Cargo.toml +++ b/raui-retained/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "raui-retained" -version = "0.64.1" +version = "0.64.2" authors = ["Patryk 'PsichiX' Budzynski "] edition = "2021" description = "RAUI retained mode UI layer" diff --git a/raui-tesselate-renderer/Cargo.toml b/raui-tesselate-renderer/Cargo.toml index 9356ae6..e399033 100644 --- a/raui-tesselate-renderer/Cargo.toml +++ b/raui-tesselate-renderer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "raui-tesselate-renderer" -version = "0.64.1" +version = "0.64.2" authors = ["Patryk 'PsichiX' Budzynski "] edition = "2021" description = "RAUI renderer that tesselates layout into vertex and index buffers"