system settings
git clone https://git.lucas.co/cce-system-interface.git
Add Dropdown corner radius spinbox control to interface layout page
src/main.rs | 26 ++++++++++++++++++++++++++
src/pages/interface.rs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/src/main.rs b/src/main.rs
index 8e5fc81..72c3f94 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -714,6 +714,8 @@ fn collect_popover_rects(w: &dyn cce_ui::widget::Element, popovers: &mut Vec<(f3
self.app.interface.font_selector_corner_radius_spinbox.set_parent(None, &mut self.ui_context);
self.app.interface.dropdown_height_spinbox.clear_children(&mut self.ui_context);
self.app.interface.dropdown_height_spinbox.set_parent(None, &mut self.ui_context);
+ self.app.interface.dropdown_corner_radius_spinbox.clear_children(&mut self.ui_context);
+ self.app.interface.dropdown_corner_radius_spinbox.set_parent(None, &mut self.ui_context);
self.app.interface.button_corner_radius_spinbox.clear_children(&mut self.ui_context);
self.app.interface.button_corner_radius_spinbox.set_parent(None, &mut self.ui_context);
self.app.interface.notification_opacity_spinbox.clear_children(&mut self.ui_context);
@@ -981,6 +983,7 @@ fn collect_popover_rects(w: &dyn cce_ui::widget::Element, popovers: &mut Vec<(f3
// (Dropdown child widgets)
link_parent_child(&mut self.page_sec_containers[3], &mut self.app.interface.dropdown_height_spinbox, &mut self.ui_context);
+ link_parent_child(&mut self.page_sec_containers[3], &mut self.app.interface.dropdown_corner_radius_spinbox, &mut self.ui_context);
// (Button child widgets)
link_parent_child(&mut self.page_sec_containers[3], &mut self.app.interface.button_corner_radius_spinbox, &mut self.ui_context);
@@ -1978,6 +1981,9 @@ fn collect_popover_rects(w: &dyn cce_ui::widget::Element, popovers: &mut Vec<(f3
if self.app.interface.dropdown_height_spinbox.cursor_moved(lx, ly, &mut self.ui_context) {
changed = true;
}
+ if self.app.interface.dropdown_corner_radius_spinbox.cursor_moved(lx, ly, &mut self.ui_context) {
+ changed = true;
+ }
if self.app.interface.button_corner_radius_spinbox.cursor_moved(lx, ly, &mut self.ui_context) {
changed = true;
}
@@ -2468,6 +2474,7 @@ fn collect_popover_rects(w: &dyn cce_ui::widget::Element, popovers: &mut Vec<(f3
if self.app.interface.font_selector_height_spinbox.hit_test(lx, ly, &self.ui_context) { clicked_any_focusable = true; }
if self.app.interface.font_selector_corner_radius_spinbox.hit_test(lx, ly, &self.ui_context) { clicked_any_focusable = true; }
if self.app.interface.dropdown_height_spinbox.hit_test(lx, ly, &self.ui_context) { clicked_any_focusable = true; }
+ if self.app.interface.dropdown_corner_radius_spinbox.hit_test(lx, ly, &self.ui_context) { clicked_any_focusable = true; }
if self.app.interface.button_corner_radius_spinbox.hit_test(lx, ly, &self.ui_context) { clicked_any_focusable = true; }
if self.app.interface.notification_opacity_spinbox.hit_test(lx, ly, &self.ui_context) { clicked_any_focusable = true; }
let tf = &mut self.app.interface;
@@ -2921,6 +2928,12 @@ fn collect_popover_rects(w: &dyn cce_ui::widget::Element, popovers: &mut Vec<(f3
if sb.mouse_input(button, state, lx, ly, &mut self.ui_context) && sb.value != old {
actions.push(AppAction::Interface(pages::interface::InterfaceMessage::SetDropdownHeight(sb.value as u16)));
}
+ let sb = &mut self.app.interface.dropdown_corner_radius_spinbox;
+ if !sb.hit_test(lx, ly, &self.ui_context) { sb.unfocus(); }
+ let old = sb.value;
+ if sb.mouse_input(button, state, lx, ly, &mut self.ui_context) && sb.value != old {
+ actions.push(AppAction::Interface(pages::interface::InterfaceMessage::SetDropdownCornerRadius(sb.value as u16)));
+ }
let sb = &mut self.app.interface.button_corner_radius_spinbox;
if !sb.hit_test(lx, ly, &self.ui_context) { sb.unfocus(); }
let old = sb.value;
@@ -3740,6 +3753,9 @@ fn collect_popover_rects(w: &dyn cce_ui::widget::Element, popovers: &mut Vec<(f3
if self.app.interface.dropdown_height_spinbox.take_change() {
actions.push(AppAction::Interface(pages::interface::InterfaceMessage::SetDropdownHeight(self.app.interface.dropdown_height_spinbox.value as u16)));
}
+ if self.app.interface.dropdown_corner_radius_spinbox.take_change() {
+ actions.push(AppAction::Interface(pages::interface::InterfaceMessage::SetDropdownCornerRadius(self.app.interface.dropdown_corner_radius_spinbox.value as u16)));
+ }
if self.app.interface.button_corner_radius_spinbox.take_change() {
actions.push(AppAction::Interface(pages::interface::InterfaceMessage::SetButtonCornerRadius(self.app.interface.button_corner_radius_spinbox.value as u16)));
}
@@ -4641,6 +4657,16 @@ fn collect_popover_rects(w: &dyn cce_ui::widget::Element, popovers: &mut Vec<(f3
self.needs_rebuild = true;
return true;
}
+ let sb = &mut self.app.interface.dropdown_corner_radius_spinbox;
+ let old = sb.value;
+ if sb.keyboard_input(event, &mut self.ui_context) {
+ let new_val = sb.value;
+ if new_val != old {
+ self.handle_action(&AppAction::Interface(pages::interface::InterfaceMessage::SetDropdownCornerRadius(new_val as u16)));
+ }
+ self.needs_rebuild = true;
+ return true;
+ }
let sb = &mut self.app.interface.button_corner_radius_spinbox;
let old = sb.value;
if sb.keyboard_input(event, &mut self.ui_context) {
diff --git a/src/pages/interface.rs b/src/pages/interface.rs
index 0a810aa..8d92705 100644
--- a/src/pages/interface.rs
+++ b/src/pages/interface.rs
@@ -82,6 +82,8 @@ pub struct InterfaceState {
pub font_selector_corner_radius_spinbox: Spinbox,
pub dropdown_height: u16,
pub dropdown_height_spinbox: Spinbox,
+ pub dropdown_corner_radius: u16,
+ pub dropdown_corner_radius_spinbox: Spinbox,
pub button_corner_radius: u16,
pub button_corner_radius_spinbox: Spinbox,
pub nested_section_label_alignment: u8,
@@ -223,6 +225,8 @@ impl Default for InterfaceState {
font_selector_corner_radius_spinbox: Spinbox::new(4, 0, 50, 1).with_label("Border Radius").with_unit("px"),
dropdown_height: 44,
dropdown_height_spinbox: Spinbox::new(44, 10, 100, 1).with_label("Height").with_unit("px"),
+ dropdown_corner_radius: 4,
+ dropdown_corner_radius_spinbox: Spinbox::new(4, 0, 50, 1).with_label("Radius").with_unit("px"),
button_corner_radius: 4,
button_corner_radius_spinbox: Spinbox::new(4, 0, 50, 1).with_label("Radius").with_unit("px"),
nested_section_label_alignment: 0,
@@ -331,6 +335,7 @@ pub enum InterfaceMessage {
SetFontSelectorHeight(u16),
SetFontSelectorCornerRadius(u16),
SetDropdownHeight(u16),
+ SetDropdownCornerRadius(u16),
SetButtonCornerRadius(u16),
SetColorSelectorFont(String),
SetMenubarFont(String),
@@ -454,6 +459,7 @@ pub fn read_interface_config() -> InterfaceState {
let font_selector_height = parse_u16_from(&content, "font_selector_height", 44);
let font_selector_corner_radius = parse_u16_from(&content, "font_selector_corner_radius", 4);
let dropdown_height = parse_u16_from(&content, "dropdown_height", 44);
+ let dropdown_corner_radius = parse_u16_from(&content, "dropdown_corner_radius", 4);
let button_corner_radius = parse_u16_from(&content, "button_corner_radius", 4);
let color_selector_font = parse_string_from(&content, "color_selector_font", "monospace");
let menubar_font = parse_string_from(&content, "menubar_font", "Outfit");
@@ -553,6 +559,8 @@ pub fn read_interface_config() -> InterfaceState {
font_selector_corner_radius_spinbox: Spinbox::new(font_selector_corner_radius as i32, 0, 50, 1).with_label("Border Radius").with_unit("px"),
dropdown_height,
dropdown_height_spinbox: Spinbox::new(dropdown_height as i32, 10, 100, 1).with_label("Height").with_unit("px"),
+ dropdown_corner_radius,
+ dropdown_corner_radius_spinbox: Spinbox::new(dropdown_corner_radius as i32, 0, 50, 1).with_label("Radius").with_unit("px"),
button_corner_radius,
button_corner_radius_spinbox: Spinbox::new(button_corner_radius as i32, 0, 50, 1).with_label("Radius").with_unit("px"),
nested_section_label_alignment,
@@ -983,6 +991,11 @@ fn apply_dropdown_height(height: u16) {
cce_ui::layout::set_dropdown_height(height as f32);
}
+fn apply_dropdown_corner_radius(radius: u16) {
+ write_config_value("dropdown_corner_radius", &radius.to_string());
+ cce_ui::layout::set_dropdown_corner_radius(radius as f32);
+}
+
fn apply_button_corner_radius(radius: u16) {
write_config_value("button_corner_radius", &radius.to_string());
cce_ui::layout::set_button_corner_radius(radius as f32);
@@ -1691,6 +1704,9 @@ pub fn view(state: &mut InterfaceState, cx: f32, cy: f32, cw: f32, ch: f32, sec_
subsec.spacing(8.0);
state.dropdown_height_spinbox.value = state.dropdown_height as i32;
subsec.widget_full(&mut state.dropdown_height_spinbox, 44.0, ctx);
+ subsec.spacing(4.0);
+ state.dropdown_corner_radius_spinbox.value = state.dropdown_corner_radius as i32;
+ subsec.widget_full(&mut state.dropdown_corner_radius_spinbox, 44.0, ctx);
subsec.spacing(8.0);
});
sec.spacing(12.0);
@@ -2003,6 +2019,10 @@ pub fn update(state: &mut InterfaceState, msg: InterfaceMessage) {
state.dropdown_height = height;
apply_dropdown_height(height);
}
+ InterfaceMessage::SetDropdownCornerRadius(radius) => {
+ state.dropdown_corner_radius = radius;
+ apply_dropdown_corner_radius(radius);
+ }
InterfaceMessage::SetButtonCornerRadius(radius) => {
state.button_corner_radius = radius;
apply_button_corner_radius(radius);
@@ -3466,6 +3486,34 @@ mod tests {
let _ = fs::remove_file(path_str);
}
+ #[test]
+ fn test_read_write_dropdown_corner_radius() {
+ let dir = std::env::temp_dir();
+ let path = dir.join("test_dropdown_corner_radius_config.toml");
+ let path_str = path.to_str().unwrap();
+
+ // 1. Initial configuration
+ let initial_content = "[layout]\ngap = 18\nborder_color = \"#374673\"\n";
+ fs::write(path_str, initial_content).unwrap();
+
+ // 2. Parse dropdown_corner_radius when missing (should return default 4)
+ let content = fs::read_to_string(path_str).unwrap();
+ let val = parse_u16_from(&content, "dropdown_corner_radius", 4);
+ assert_eq!(val, 4);
+
+ // 3. Write dropdown_corner_radius config
+ assert!(write_config_value_path(path_str, "dropdown_corner_radius", "12"));
+ let updated = fs::read_to_string(path_str).unwrap();
+ assert!(updated.contains("dropdown_corner_radius = 12"));
+
+ // 4. Parse dropdown_corner_radius when present (should return written value 12)
+ let val2 = parse_u16_from(&updated, "dropdown_corner_radius", 4);
+ assert_eq!(val2, 12);
+
+ // Clean up
+ let _ = fs::remove_file(path_str);
+ }
+
#[test]
fn test_read_write_label_margin() {
let dir = std::env::temp_dir();