@effindomv2/fui-rs 0.1.8 → 0.1.10

package/src/controls/internal/text_input_core.rs

@@ -147,12 +147,6 @@ pub struct TextInputCore {
     focus_visibility_guard: RefCell<Option<SubscriptionGuard>>,
 }
 
-impl Default for TextInputCore {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl TextInputCore {
     pub fn new() -> Self {
         Self::with_profile(TextInputProfile::single_line())
@@ -200,7 +194,7 @@ impl TextInputCore {
         };
 
         let presenter = create_presenter(profile, None);
-        presenter.bind(root.clone(), editor_text.clone(), placeholder_host.clone());
+        presenter.bind(editor_text.clone(), placeholder_host.clone());
 
         let this = Self {
             self_weak: RefCell::new(Weak::new()),
@@ -357,7 +351,15 @@ impl TextInputCore {
         self.selection_range(end, end)
     }
 
-    pub fn colors(&self, colors: Option<TextInputColors>) -> &Self {
+    pub fn colors(&self, colors: TextInputColors) -> &Self {
+        self.set_colors(Some(colors))
+    }
+
+    pub fn clear_colors(&self) -> &Self {
+        self.set_colors(None)
+    }
+
+    fn set_colors(&self, colors: Option<TextInputColors>) -> &Self {
         self.colors_value.set(colors);
         self.sync_theme_state();
         self
@@ -423,14 +425,18 @@ impl TextInputCore {
         self
     }
 
-    pub fn template(&self, template: Option<Rc<dyn TextInputTemplate>>) -> &Self {
+    pub fn template(&self, template: Rc<dyn TextInputTemplate>) -> &Self {
+        self.set_template(Some(template))
+    }
+
+    pub fn clear_template(&self) -> &Self {
+        self.set_template(None)
+    }
+
+    fn set_template(&self, template: Option<Rc<dyn TextInputTemplate>>) -> &Self {
         *self.template.borrow_mut() = template.clone();
         let presenter = create_presenter(self.profile, template);
-        presenter.bind(
-            self.root.clone(),
-            self.editor_text.clone(),
-            self.placeholder_host.clone(),
-        );
+        presenter.bind(self.editor_text.clone(), self.placeholder_host.clone());
         *self.presenter.borrow_mut() = presenter;
         self.sync_theme_state();
         self
@@ -629,7 +635,7 @@ impl TextInputCore {
             theme.fonts.size_body
         };
         let line_height = resolved_font_size + theme.spacing.sm;
-        self.presenter.borrow().apply(
+        let host_style = self.presenter.borrow().present(
             theme.clone(),
             &TextInputVisualState {
                 multiline: self.profile.multiline,
@@ -638,6 +644,7 @@ impl TextInputCore {
             },
             self.colors_value.get(),
         );
+        self.root.apply_presenter_style(host_style);
 
         let colors = self.colors_value.get();
         let text_color = if is_enabled(&self.root) {
@@ -1013,7 +1020,18 @@ impl TextInputCore {
             && is_enabled(&self.root)
             && focus_visibility::keyboard_focus_visible()
         {
-            focus_adorner::show_standard(&self.root, current_theme().spacing.sm);
+            let corners = self
+                .root
+                .resolved_host_style()
+                .corners
+                .unwrap_or_else(|| crate::Corners::all(current_theme().spacing.sm));
+            focus_adorner::show_standard_corners(
+                &self.root,
+                corners.top_left,
+                corners.top_right,
+                corners.bottom_right,
+                corners.bottom_left,
+            );
             return;
         }
         focus_adorner::hide_owner(&self.root);
@@ -1052,12 +1070,6 @@ impl TextInputCore {
     }
 }
 
-impl HasFlexBoxRoot for TextInputCore {
-    fn flex_box_root(&self) -> &FlexBox {
-        &self.root
-    }
-}
-
 impl TextInputCore {
     pub(crate) fn build_control(&self) {
         self.root.build();
@@ -1072,3 +1084,9 @@ impl TextInputCore {
         self.editor_text.clone()
     }
 }
+
+impl HasFlexBoxRoot for TextInputCore {
+    fn flex_box_root(&self) -> &FlexBox {
+        &self.root
+    }
+}

package/src/controls/internal/text_input_presenter.rs

@@ -1,6 +1,6 @@
 use crate::controls::TextInputColors;
 use crate::ffi::{CursorStyle, Unit};
-use crate::node::{FlexBox, TextCore};
+use crate::node::{Border, Corners, EdgeInsets, FlexBox, PresenterHostStyle, TextCore};
 use crate::theme::Theme;
 use std::cell::RefCell;
 use std::rc::Rc;
@@ -13,8 +13,13 @@ pub struct TextInputVisualState {
 }
 
 pub trait TextInputPresenter {
-    fn bind(&self, host: FlexBox, editor_host: TextCore, placeholder_host: FlexBox);
-    fn apply(&self, theme: Theme, state: &TextInputVisualState, colors: Option<TextInputColors>);
+    fn bind(&self, editor_host: TextCore, placeholder_host: FlexBox);
+    fn present(
+        &self,
+        theme: Theme,
+        state: &TextInputVisualState,
+        colors: Option<TextInputColors>,
+    ) -> PresenterHostStyle;
 }
 
 pub trait TextInputTemplate {
@@ -23,7 +28,6 @@ pub trait TextInputTemplate {
 
 #[derive(Clone, Default)]
 pub struct DefaultTextInputPresenter {
-    host: RefCell<Option<FlexBox>>,
     editor_host: RefCell<Option<TextCore>>,
     placeholder_host: RefCell<Option<FlexBox>>,
 }
@@ -35,21 +39,22 @@ impl DefaultTextInputPresenter {
 }
 
 impl TextInputPresenter for DefaultTextInputPresenter {
-    fn bind(&self, host: FlexBox, editor_host: TextCore, placeholder_host: FlexBox) {
-        *self.host.borrow_mut() = Some(host);
+    fn bind(&self, editor_host: TextCore, placeholder_host: FlexBox) {
         *self.editor_host.borrow_mut() = Some(editor_host);
         *self.placeholder_host.borrow_mut() = Some(placeholder_host);
     }
 
-    fn apply(&self, theme: Theme, state: &TextInputVisualState, colors: Option<TextInputColors>) {
-        let Some(host) = self.host.borrow().clone() else {
-            return;
-        };
+    fn present(
+        &self,
+        theme: Theme,
+        state: &TextInputVisualState,
+        colors: Option<TextInputColors>,
+    ) -> PresenterHostStyle {
         let Some(editor_host) = self.editor_host.borrow().clone() else {
-            return;
+            return PresenterHostStyle::new();
         };
         let Some(placeholder_host) = self.placeholder_host.borrow().clone() else {
-            return;
+            return PresenterHostStyle::new();
         };
 
         let horizontal_padding = theme.spacing.md;
@@ -73,22 +78,23 @@ impl TextInputPresenter for DefaultTextInputPresenter {
             .map(|value| value.border_color())
             .unwrap_or(theme.colors.border);
 
-        host.bg_color(bg)
-            .corner_radius(theme.spacing.sm)
-            .border(1.0, border_color)
-            .padding(
-                horizontal_padding,
-                vertical_padding,
-                horizontal_padding,
-                vertical_padding,
-            )
-            .cursor(shell_cursor)
-            .opacity(if state.enabled { 1.0 } else { 0.6 });
         editor_host.cursor(editable_cursor);
         placeholder_host
             .position(horizontal_padding, vertical_padding)
             .width(100.0, Unit::Percent)
             .cursor(editable_cursor);
+        PresenterHostStyle::new()
+            .background(bg)
+            .corners(Corners::all(theme.spacing.sm))
+            .border(Border::solid(1.0, border_color))
+            .padding(EdgeInsets::new(
+                horizontal_padding,
+                vertical_padding,
+                horizontal_padding,
+                vertical_padding,
+            ))
+            .cursor(shell_cursor)
+            .opacity(if state.enabled { 1.0 } else { 0.6 })
     }
 }
 

package/src/controls/mod.rs

@@ -5,7 +5,7 @@ use crate::ffi::{
     SemanticCheckedState, SemanticRole, Unit,
 };
 use crate::node::{
-    flex_box, row, Border, Child, FlexBox, HasFlexBoxRoot, Node, NodeRef, TextNode, WeakNodeRef,
+    flex_box, row, Child, FlexBox, HasFlexBoxRoot, Node, NodeRef, TextNode, WeakNodeRef,
 };
 use crate::theme::{current_theme, subscribe};
 use std::cell::{Cell, RefCell};
@@ -106,6 +106,7 @@ pub struct ComboBoxChangedEventArgs<T> {
 }
 
 pub mod anti_selection_area;
+mod appearance;
 pub mod button;
 pub mod checkbox;
 pub mod combobox;
@@ -130,6 +131,10 @@ pub mod text_area;
 pub mod text_input;
 
 pub use anti_selection_area::AntiSelectionArea;
+pub use appearance::{
+    ContextMenuAppearance, ContextMenuItemAppearance, DialogAppearance, OverlayBackdropAppearance,
+    PopupAppearance, SurfaceAppearance,
+};
 pub use button::Button;
 pub use checkbox::Checkbox;
 pub use combobox::{ComboBox, ComboBoxCommitMode, ComboBoxFilterMode, ComboBoxItem};
@@ -142,7 +147,7 @@ pub use control_template_set::{
 };
 pub use control_tokens::{
     ButtonColors, DropdownColors, DropdownSizing, LabeledControlColors, LabeledControlSizing,
-    SliderColors, SliderSizing, TextInputColors,
+    ProgressBarColors, ProgressBarSizing, SliderColors, SliderSizing, TextInputColors,
 };
 pub use dialog::{Dialog, DialogShownEventArgs};
 pub use dropdown::{Dropdown, DropdownItem};

package/src/controls/nav_link.rs

@@ -5,7 +5,6 @@ use crate::ffi::{CursorStyle, HandleValue, SemanticRole};
 use crate::navigation;
 use crate::node::{text, NodeHandle, NodeRef, WeakFlexBox};
 use crate::platform;
-use crate::signal::SubscriptionGuard;
 use crate::theme::{current_theme, subscribe};
 use crate::{focus_adorner, focus_visibility};
 use std::cell::{Cell, RefCell};
@@ -43,8 +42,6 @@ pub struct NavLink {
     enter_pressed_open_in_new_tab: Rc<Cell<bool>>,
     preview_pinned_for_context_menu: Rc<Cell<bool>>,
     text_color_override: Rc<Cell<Option<u32>>>,
-    theme_guard: Rc<RefCell<Option<SubscriptionGuard>>>,
-    focus_visibility_guard: Rc<RefCell<Option<SubscriptionGuard>>>,
 }
 
 impl NavLink {
@@ -62,7 +59,6 @@ impl NavLink {
         label_node
             .font_family(theme.fonts.body_family.clone())
             .font_size(15.0)
-            .text_color(theme.colors.accent)
             .cursor(CursorStyle::Pointer);
         root.justify_content(JustifyContent::Start)
             .align_items(AlignItems::Center)
@@ -90,8 +86,6 @@ impl NavLink {
             enter_pressed_open_in_new_tab: Rc::new(Cell::new(false)),
             preview_pinned_for_context_menu: Rc::new(Cell::new(false)),
             text_color_override: Rc::new(Cell::new(None)),
-            theme_guard: Rc::new(RefCell::new(None)),
-            focus_visibility_guard: Rc::new(RefCell::new(None)),
         };
         let node_ref = link.root.retained_node_ref();
         let pin_target = link.event_target();
@@ -197,15 +191,20 @@ impl NavLink {
 
     fn install_subscriptions(&self) {
         let target = self.event_target();
-        *self.theme_guard.borrow_mut() = Some(subscribe(move |_theme| {
+        let theme_guard = subscribe(move |_theme| {
             target.sync_visual_state();
             target.sync_focus_chrome();
-        }));
+        });
+        self.root
+            .retained_node_ref()
+            .retain_attachment(Rc::new(theme_guard));
         let target = self.event_target();
-        *self.focus_visibility_guard.borrow_mut() =
-            Some(focus_visibility::subscribe(move |_visible| {
-                target.sync_focus_chrome();
-            }));
+        let focus_guard = focus_visibility::subscribe(move |_visible| {
+            target.sync_focus_chrome();
+        });
+        self.root
+            .retained_node_ref()
+            .retain_attachment(Rc::new(focus_guard));
     }
 
     fn event_target(&self) -> NavLinkEventTarget {
@@ -263,6 +262,10 @@ impl NavLink {
         self
     }
 
+    pub fn label_node(&self) -> TextNode {
+        self.label.clone()
+    }
+
     pub fn open_in_new_tab(&self, open: bool) -> &Self {
         self.open_in_new_tab.set(open);
         self
@@ -289,6 +292,7 @@ impl Node for NavLink {
 
     fn build_self(&self) {
         self.root.build_self();
+        self.sync_visual_state();
     }
 }
 
@@ -403,13 +407,15 @@ impl NavLinkEventTarget {
     }
 
     fn sync_visual_state(&self) {
-        let color = self.text_color_override.get().unwrap_or_else(|| {
-            if self.hovered.get() {
-                current_theme().colors.accent_hovered
-            } else {
-                current_theme().colors.accent
-            }
-        });
+        let theme = current_theme();
+        let color = if self.hovered.get() {
+            theme.colors.accent_hovered
+        } else {
+            self.text_color_override
+                .get()
+                .or_else(|| self.label.configured_text_color())
+                .unwrap_or(theme.colors.accent)
+        };
         if self.label.handle() != NodeHandle::INVALID {
             ui::set_text_color(self.label.handle().raw(), color);
         }

package/src/controls/popup.rs

@@ -1,6 +1,6 @@
 use super::*;
 use crate::ffi::{FlexDirection, PositionType, Unit};
-use crate::node::{portal, Border, Child};
+use crate::node::{portal, Child};
 use crate::popup_presenter::{PopupPlacement, PopupPresenter};
 use std::cell::Cell;
 
@@ -10,6 +10,7 @@ pub struct Popup {
     surface_node: FlexBox,
     presenter: PopupPresenter,
     dismiss_on_backdrop_click: Rc<Cell<bool>>,
+    appearance_value: Rc<RefCell<Option<PopupAppearance>>>,
 }
 
 impl Default for Popup {
@@ -46,6 +47,7 @@ impl Popup {
             surface_node,
             presenter,
             dismiss_on_backdrop_click,
+            appearance_value: Rc::new(RefCell::new(None)),
         }
     }
 
@@ -77,13 +79,15 @@ impl Popup {
         self
     }
 
-    pub fn backdrop_color(&self, color: u32) -> &Self {
-        self.presenter.backdrop_color(color);
+    pub fn appearance(&self, appearance: PopupAppearance) -> &Self {
+        self.appearance_value.replace(Some(appearance));
+        self.sync_appearance();
         self
     }
 
-    pub fn background_blur(&self, sigma: f32) -> &Self {
-        self.presenter.background_blur(sigma);
+    pub fn clear_appearance(&self) -> &Self {
+        self.appearance_value.replace(None);
+        self.sync_appearance();
         self
     }
 
@@ -105,42 +109,16 @@ impl Popup {
         self
     }
 
-    pub fn panel_color(&self, color: u32) -> &Self {
-        self.surface_node.bg_color(color);
-        self
-    }
-
-    pub fn panel_background_blur(&self, sigma: f32) -> &Self {
-        self.surface_node.background_blur(sigma);
-        self
-    }
-
-    pub fn panel_corner_radius(&self, radius: f32) -> &Self {
-        self.surface_node.corner_radius(radius);
-        self
-    }
-
-    pub fn panel_border(&self, width: f32, color: u32) -> &Self {
-        self.surface_node.border(width, color);
-        self
-    }
-
-    pub fn panel_border_config(&self, border: Border) -> &Self {
-        self.surface_node.border_config(border);
-        self
-    }
-
-    pub fn panel_shadow(
-        &self,
-        color: u32,
-        offset_x: f32,
-        offset_y: f32,
-        blur_sigma: f32,
-        spread: f32,
-    ) -> &Self {
+    fn sync_appearance(&self) {
+        let appearance = self.appearance_value.borrow().clone().unwrap_or_default();
+        let panel = appearance.panel.unwrap_or_default();
+        let backdrop = appearance.backdrop.unwrap_or_default();
         self.surface_node
-            .drop_shadow(color, offset_x, offset_y, blur_sigma, spread);
-        self
+            .apply_presenter_style(panel.presenter_host_style())
+            .background_blur(panel.background_blur.unwrap_or(0.0));
+        self.presenter
+            .backdrop_color(backdrop.color.unwrap_or(0x00000000))
+            .background_blur(backdrop.blur.unwrap_or(0.0));
     }
 
     pub fn show_anchored(
@@ -189,3 +167,9 @@ impl Node for Popup {
         self.root.dispose();
     }
 }
+
+impl crate::node::HasFlexBoxRoot for Popup {
+    fn flex_box_root(&self) -> &FlexBox {
+        &self.root
+    }
+}