Skip to content

Commit

Permalink
Add user defined style properties
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zoxc
Zoxc committed Oct 30, 2023
1 parent 646a1fb commit abd3ce4
Show file tree
Hide file tree
Showing 5 changed files with 283 additions and 88 deletions.
79 changes: 42 additions & 37 deletions src/context.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::{
collections::{HashMap, HashSet},
ops::{Deref, DerefMut},
rc::Rc,
time::Duration,
};

Expand All @@ -23,7 +24,7 @@ use crate::{
menu::Menu,
pointer::PointerInputEvent,
responsive::{GridBreakpoints, ScreenSize, ScreenSizeBp},
style::{ComputedStyle, CursorStyle, Style, StyleSelector},
style::{ComputedStyle, CursorStyle, Style, StyleMap, StyleProp, StyleSelector},
};

pub type EventCallback = dyn Fn(&Event) -> bool;
Expand Down Expand Up @@ -666,16 +667,42 @@ pub struct InteractionState {
pub(crate) using_keyboard_navigation: bool,
}

pub(crate) struct StyleCx {
pub(crate) current: Rc<StyleMap>,
saved: Vec<Rc<StyleMap>>,
}

impl StyleCx {
fn new() -> Self {
Self {
current: Default::default(),
saved: Default::default(),
}
}

Check warning on line 681 in src/context.rs

View check run for this annotation

Codecov / codecov/patch

src/context.rs#L676-L681 

Added lines #L676 - L681 were not covered by tests

pub(crate) fn clear(&mut self) {
self.current = Default::default();
self.saved.clear();
}

Check warning on line 686 in src/context.rs

View check run for this annotation

Codecov / codecov/patch

src/context.rs#L683-L686 

Added lines #L683 - L686 were not covered by tests

pub fn save(&mut self) {
self.saved.push(self.current.clone());
}

Check warning on line 690 in src/context.rs

View check run for this annotation

Codecov / codecov/patch

src/context.rs#L688-L690 

Added lines #L688 - L690 were not covered by tests

pub fn restore(&mut self) {
self.current = self.saved.pop().unwrap_or_default();
}

Check warning on line 694 in src/context.rs

View check run for this annotation

Codecov / codecov/patch

src/context.rs#L692-L694 

Added lines #L692 - L694 were not covered by tests
}

/// Holds current layout state for given position in the tree.
/// You'll use this in the `View::layout` implementation to call `layout_node` on children and to access any font
pub struct LayoutCx<'a> {
app_state: &'a mut AppState,
pub(crate) viewport: Option<Rect>,
pub(crate) color: Option<Color>,
pub(crate) scroll_bar_color: Option<Color>,
pub(crate) style: StyleCx,
pub(crate) scroll_bar_hover_color: Option<Color>,
pub(crate) scroll_bar_drag_color: Option<Color>,
pub(crate) scroll_bar_bg_active_color: Option<Color>,
pub(crate) scroll_bar_rounded: Option<bool>,
pub(crate) scroll_bar_thickness: Option<f32>,
pub(crate) scroll_bar_edge_width: Option<f32>,
Expand All @@ -687,10 +714,8 @@ pub struct LayoutCx<'a> {
pub(crate) window_origin: Point,
pub(crate) saved_viewports: Vec<Option<Rect>>,
pub(crate) saved_colors: Vec<Option<Color>>,
pub(crate) saved_scroll_bar_colors: Vec<Option<Color>>,
pub(crate) saved_scroll_bar_hover_colors: Vec<Option<Color>>,
pub(crate) saved_scroll_bar_drag_colors: Vec<Option<Color>>,
pub(crate) saved_scroll_bar_bg_active_colors: Vec<Option<Color>>,
pub(crate) saved_scroll_bar_roundeds: Vec<Option<bool>>,
pub(crate) saved_scroll_bar_thicknesses: Vec<Option<f32>>,
pub(crate) saved_scroll_bar_edge_widths: Vec<Option<f32>>,
Expand All @@ -714,6 +739,7 @@ impl<'a> LayoutCx<'a> {
font_style: None,
line_height: None,
window_origin: Point::ZERO,
style: StyleCx::new(),

Check warning on line 742 in src/context.rs

View check run for this annotation

Codecov / codecov/patch

src/context.rs#L742 

Added line #L742 was not covered by tests
saved_viewports: Vec::new(),
saved_colors: Vec::new(),
saved_font_sizes: Vec::new(),
Expand All @@ -722,40 +748,41 @@ impl<'a> LayoutCx<'a> {
saved_font_styles: Vec::new(),
saved_line_heights: Vec::new(),
saved_window_origins: Vec::new(),
scroll_bar_color: None,
scroll_bar_hover_color: None,
scroll_bar_drag_color: None,
scroll_bar_bg_active_color: None,
scroll_bar_rounded: None,
scroll_bar_thickness: None,
scroll_bar_edge_width: None,
saved_scroll_bar_colors: Vec::new(),
saved_scroll_bar_hover_colors: Vec::new(),
saved_scroll_bar_drag_colors: Vec::new(),
saved_scroll_bar_bg_active_colors: Vec::new(),
saved_scroll_bar_roundeds: Vec::new(),
saved_scroll_bar_thicknesses: Vec::new(),
saved_scroll_bar_edge_widths: Vec::new(),
}
}

pub fn get_prop<P: StyleProp>(&self, _prop: P) -> Option<P::Type> {
self.style
.current
.map
.get(&P::prop_ref())
.and_then(|v| v.downcast_ref().cloned())
}

Check warning on line 770 in src/context.rs

View check run for this annotation

Codecov / codecov/patch

src/context.rs#L764-L770 

Added lines #L764 - L770 were not covered by tests

pub(crate) fn clear(&mut self) {
self.style.clear();

Check warning on line 773 in src/context.rs

View check run for this annotation

Codecov / codecov/patch

src/context.rs#L773 

Added line #L773 was not covered by tests
self.viewport = None;
self.scroll_bar_color = None;
self.scroll_bar_hover_color = None;
self.scroll_bar_drag_color = None;
self.scroll_bar_bg_active_color = None;
self.scroll_bar_rounded = None;
self.scroll_bar_thickness = None;
self.scroll_bar_edge_width = None;
self.font_size = None;
self.window_origin = Point::ZERO;
self.saved_colors.clear();
self.saved_viewports.clear();
self.saved_scroll_bar_colors.clear();
self.saved_scroll_bar_hover_colors.clear();
self.saved_scroll_bar_drag_colors.clear();
self.saved_scroll_bar_bg_active_colors.clear();
self.saved_scroll_bar_roundeds.clear();
self.saved_scroll_bar_thicknesses.clear();
self.saved_scroll_bar_edge_widths.clear();
Expand All @@ -768,15 +795,13 @@ impl<'a> LayoutCx<'a> {
}

pub fn save(&mut self) {
self.style.save();

Check warning on line 798 in src/context.rs

View check run for this annotation

Codecov / codecov/patch

src/context.rs#L798 

Added line #L798 was not covered by tests
self.saved_viewports.push(self.viewport);
self.saved_colors.push(self.color);
self.saved_scroll_bar_colors.push(self.scroll_bar_color);
self.saved_scroll_bar_hover_colors
.push(self.scroll_bar_hover_color);
self.saved_scroll_bar_drag_colors
.push(self.scroll_bar_drag_color);
self.saved_scroll_bar_bg_active_colors
.push(self.scroll_bar_bg_active_color);
self.saved_scroll_bar_roundeds.push(self.scroll_bar_rounded);
self.saved_scroll_bar_thicknesses
.push(self.scroll_bar_thickness);
Expand All @@ -791,15 +816,11 @@ impl<'a> LayoutCx<'a> {
}

pub fn restore(&mut self) {
self.style.restore();

Check warning on line 819 in src/context.rs

View check run for this annotation

Codecov / codecov/patch

src/context.rs#L819 

Added line #L819 was not covered by tests
self.viewport = self.saved_viewports.pop().unwrap_or_default();
self.color = self.saved_colors.pop().unwrap_or_default();
self.scroll_bar_color = self.saved_scroll_bar_colors.pop().unwrap_or_default();
self.scroll_bar_hover_color = self.saved_scroll_bar_hover_colors.pop().unwrap_or_default();
self.scroll_bar_drag_color = self.saved_scroll_bar_drag_colors.pop().unwrap_or_default();
self.scroll_bar_bg_active_color = self
.saved_scroll_bar_bg_active_colors
.pop()
.unwrap_or_default();
self.scroll_bar_rounded = self.saved_scroll_bar_roundeds.pop().unwrap_or_default();
self.scroll_bar_thickness = self.saved_scroll_bar_thicknesses.pop().unwrap_or_default();
self.scroll_bar_edge_width = self.saved_scroll_bar_edge_widths.pop().unwrap_or_default();
Expand All @@ -819,10 +840,6 @@ impl<'a> LayoutCx<'a> {
self.app_state
}

pub fn current_scroll_bar_color(&self) -> Option<Color> {
self.scroll_bar_color
}

pub fn current_scroll_bar_hover_color(&self) -> Option<Color> {
self.scroll_bar_hover_color
}
Expand All @@ -831,10 +848,6 @@ impl<'a> LayoutCx<'a> {
self.scroll_bar_drag_color
}

pub fn current_scroll_bar_bg_active_color(&self) -> Option<Color> {
self.scroll_bar_bg_active_color
}

pub fn current_scroll_bar_rounded(&self) -> Option<bool> {
self.scroll_bar_rounded
}
Expand Down Expand Up @@ -945,7 +958,6 @@ pub struct PaintCx<'a> {
pub(crate) transform: Affine,
pub(crate) clip: Option<RoundedRect>,
pub(crate) color: Option<Color>,
pub(crate) scroll_bar_color: Option<Color>,
pub(crate) scroll_bar_rounded: Option<bool>,
pub(crate) scroll_bar_thickness: Option<f32>,
pub(crate) scroll_bar_edge_width: Option<f32>,
Expand All @@ -958,7 +970,6 @@ pub struct PaintCx<'a> {
pub(crate) saved_transforms: Vec<Affine>,
pub(crate) saved_clips: Vec<Option<RoundedRect>>,
pub(crate) saved_colors: Vec<Option<Color>>,
pub(crate) saved_scroll_bar_colors: Vec<Option<Color>>,
pub(crate) saved_scroll_bar_roundeds: Vec<Option<bool>>,
pub(crate) saved_scroll_bar_thicknesses: Vec<Option<f32>>,
pub(crate) saved_scroll_bar_edge_widths: Vec<Option<f32>>,
Expand All @@ -975,7 +986,6 @@ impl<'a> PaintCx<'a> {
self.saved_transforms.push(self.transform);
self.saved_clips.push(self.clip);
self.saved_colors.push(self.color);
self.saved_scroll_bar_colors.push(self.scroll_bar_color);
self.saved_scroll_bar_roundeds.push(self.scroll_bar_rounded);
self.saved_scroll_bar_thicknesses
.push(self.scroll_bar_thickness);
Expand All @@ -993,7 +1003,6 @@ impl<'a> PaintCx<'a> {
self.transform = self.saved_transforms.pop().unwrap_or_default();
self.clip = self.saved_clips.pop().unwrap_or_default();
self.color = self.saved_colors.pop().unwrap_or_default();
self.scroll_bar_color = self.saved_scroll_bar_colors.pop().unwrap_or_default();
self.scroll_bar_rounded = self.saved_scroll_bar_roundeds.pop().unwrap_or_default();
self.scroll_bar_thickness = self.saved_scroll_bar_thicknesses.pop().unwrap_or_default();
self.scroll_bar_edge_width = self.saved_scroll_bar_edge_widths.pop().unwrap_or_default();
Expand All @@ -1020,10 +1029,6 @@ impl<'a> PaintCx<'a> {
self.color
}

pub fn current_scroll_bar_color(&self) -> Option<Color> {
self.scroll_bar_color
}

pub fn current_scroll_bar_rounded(&self) -> Option<bool> {
self.scroll_bar_rounded
}
Expand Down
Loading

0 comments on commit abd3ce4

Please sign in to comment.