GPU-accelerated UI toolkit (Vulkan)
git clone https://git.lucas.co/cce-ui.git
Add font_selector_corner_radius configuration support to layout and FontSelector widget
src/layout.rs | 38 ++++++++++++++++++++++++++++++++++++++
src/widget/input/font_selector.rs | 13 +++++++++++++
2 files changed, 51 insertions(+)
diff --git a/src/layout.rs b/src/layout.rs
index f012f02..d03e17b 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -56,6 +56,7 @@ static LABEL_MARGIN: RwLock<f32> = RwLock::new(6.0);
static BUTTON_CORNER_RADIUS: RwLock<f32> = RwLock::new(4.0);
static SPINBOX_CORNER_RADIUS: RwLock<f32> = RwLock::new(4.0);
static TEXTBOX_CORNER_RADIUS: RwLock<f32> = RwLock::new(4.0);
+static FONT_SELECTOR_CORNER_RADIUS: RwLock<f32> = RwLock::new(4.0);
/// Standard line height multiplier for text layout in cce-ui.
pub const TEXT_LINE_HEIGHT_MULTIPLIER: f32 = 1.4;
@@ -171,6 +172,15 @@ pub fn reload_config() {
}
}
}
+ if let Some(rest) = trimmed.strip_prefix("font_selector_corner_radius") {
+ let rest = rest.trim_start_matches(|c: char| c == ' ' || c == '=' || c == '"');
+ let val_str = rest.trim_end_matches('"').trim();
+ if let Ok(val) = val_str.parse::<f32>() {
+ if let Ok(mut lock) = FONT_SELECTOR_CORNER_RADIUS.write() {
+ *lock = val;
+ }
+ }
+ }
if let Some(rest) = trimmed.strip_prefix("toggle_height") {
let rest = rest.trim_start_matches(|c: char| c == ' ' || c == '=' || c == '"');
let val_str = rest.trim_end_matches('"').trim();
@@ -1010,6 +1020,34 @@ pub fn set_textbox_corner_radius(radius: f32) {
}
}
+pub fn font_selector_corner_radius() -> f32 {
+ use std::sync::Once;
+ static INIT: Once = Once::new();
+ INIT.call_once(|| {
+ if let Some(content) = read_config() {
+ for line in content.lines() {
+ let trimmed = line.trim();
+ if let Some(rest) = trimmed.strip_prefix("font_selector_corner_radius") {
+ let rest = rest.trim_start_matches(|c: char| c == ' ' || c == '=' || c == '"');
+ let val_str = rest.trim_end_matches('"').trim();
+ if let Ok(val) = val_str.parse::<f32>() {
+ if let Ok(mut lock) = FONT_SELECTOR_CORNER_RADIUS.write() {
+ *lock = val;
+ }
+ }
+ }
+ }
+ }
+ });
+ *FONT_SELECTOR_CORNER_RADIUS.read().unwrap()
+}
+
+pub fn set_font_selector_corner_radius(radius: f32) {
+ if let Ok(mut lock) = FONT_SELECTOR_CORNER_RADIUS.write() {
+ *lock = radius;
+ }
+}
+
pub fn color_selector_preview_margin() -> f32 {
use std::sync::Once;
static INIT: Once = Once::new();
diff --git a/src/widget/input/font_selector.rs b/src/widget/input/font_selector.rs
index 765ca2d..6f12848 100644
--- a/src/widget/input/font_selector.rs
+++ b/src/widget/input/font_selector.rs
@@ -129,6 +129,19 @@ impl Element for FontSelector {
labels
}
+
+ fn rounded_corners(&self) -> (bool, bool, bool, bool) {
+ let r = crate::layout::font_selector_corner_radius();
+ if r > 0.0 {
+ (true, true, true, true)
+ } else {
+ (false, false, false, false)
+ }
+ }
+
+ fn corner_radius(&self) -> f32 {
+ crate::layout::font_selector_corner_radius()
+ }
}
impl Drop for FontSelector {