diff options
Diffstat (limited to 'components/style_traits')
| -rw-r--r-- | components/style_traits/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/style_traits/cursor.rs | 97 |
2 files changed, 59 insertions, 39 deletions
diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml index 3acba659820..f95e5f00e80 100644 --- a/components/style_traits/Cargo.toml +++ b/components/style_traits/Cargo.toml @@ -12,6 +12,7 @@ path = "lib.rs" [features] servo = ["heapsize", "heapsize_derive", "serde", "serde_derive", "cssparser/heapsize", "cssparser/serde"] +gecko = [] [dependencies] app_units = "0.4" diff --git a/components/style_traits/cursor.rs b/components/style_traits/cursor.rs index 447dfe0966e..cd48571d06d 100644 --- a/components/style_traits/cursor.rs +++ b/components/style_traits/cursor.rs @@ -7,21 +7,30 @@ use super::ToCss; macro_rules! define_cursor { - ($( $css: expr => $variant: ident = $value: expr, )+) => { + ( + common properties = [ + $( $c_css: expr => $c_variant: ident = $c_value: expr, )+ + ] + gecko properties = [ + $( $g_css: expr => $g_variant: ident = $g_value: expr, )+ + ] + ) => { /// https://drafts.csswg.org/css-ui/#cursor #[derive(Clone, Copy, Debug, Eq, PartialEq)] #[cfg_attr(feature = "servo", derive(Deserialize, Serialize, HeapSizeOf))] #[repr(u8)] #[allow(missing_docs)] pub enum Cursor { - $( $variant = $value ),+ + $( $c_variant = $c_value, )+ + $( #[cfg(feature = "gecko")] $g_variant = $g_value, )+ } impl Cursor { /// Given a CSS keyword, get the corresponding cursor enum. pub fn from_css_keyword(keyword: &str) -> Result<Cursor, ()> { match_ignore_ascii_case! { &keyword, - $( $css => Ok(Cursor::$variant), )+ + $( $c_css => Ok(Cursor::$c_variant), )+ + $( #[cfg(feature = "gecko")] $g_css => Ok(Cursor::$g_variant), )+ _ => Err(()) } } @@ -30,7 +39,8 @@ macro_rules! define_cursor { impl ToCss for Cursor { fn to_css<W>(&self, dest: &mut W) -> ::std::fmt::Result where W: ::std::fmt::Write { match *self { - $( Cursor::$variant => dest.write_str($css) ),+ + $( Cursor::$c_variant => dest.write_str($c_css), )+ + $( #[cfg(feature = "gecko")] Cursor::$g_variant => dest.write_str($g_css), )+ } } } @@ -39,39 +49,48 @@ macro_rules! define_cursor { define_cursor! { - "none" => None = 0, - "default" => Default = 1, - "pointer" => Pointer = 2, - "context-menu" => ContextMenu = 3, - "help" => Help = 4, - "progress" => Progress = 5, - "wait" => Wait = 6, - "cell" => Cell = 7, - "crosshair" => Crosshair = 8, - "text" => Text = 9, - "vertical-text" => VerticalText = 10, - "alias" => Alias = 11, - "copy" => Copy = 12, - "move" => Move = 13, - "no-drop" => NoDrop = 14, - "not-allowed" => NotAllowed = 15, - "grab" => Grab = 16, - "grabbing" => Grabbing = 17, - "e-resize" => EResize = 18, - "n-resize" => NResize = 19, - "ne-resize" => NeResize = 20, - "nw-resize" => NwResize = 21, - "s-resize" => SResize = 22, - "se-resize" => SeResize = 23, - "sw-resize" => SwResize = 24, - "w-resize" => WResize = 25, - "ew-resize" => EwResize = 26, - "ns-resize" => NsResize = 27, - "nesw-resize" => NeswResize = 28, - "nwse-resize" => NwseResize = 29, - "col-resize" => ColResize = 30, - "row-resize" => RowResize = 31, - "all-scroll" => AllScroll = 32, - "zoom-in" => ZoomIn = 33, - "zoom-out" => ZoomOut = 34, + common properties = [ + "none" => None = 0, + "default" => Default = 1, + "pointer" => Pointer = 2, + "context-menu" => ContextMenu = 3, + "help" => Help = 4, + "progress" => Progress = 5, + "wait" => Wait = 6, + "cell" => Cell = 7, + "crosshair" => Crosshair = 8, + "text" => Text = 9, + "vertical-text" => VerticalText = 10, + "alias" => Alias = 11, + "copy" => Copy = 12, + "move" => Move = 13, + "no-drop" => NoDrop = 14, + "not-allowed" => NotAllowed = 15, + "grab" => Grab = 16, + "grabbing" => Grabbing = 17, + "e-resize" => EResize = 18, + "n-resize" => NResize = 19, + "ne-resize" => NeResize = 20, + "nw-resize" => NwResize = 21, + "s-resize" => SResize = 22, + "se-resize" => SeResize = 23, + "sw-resize" => SwResize = 24, + "w-resize" => WResize = 25, + "ew-resize" => EwResize = 26, + "ns-resize" => NsResize = 27, + "nesw-resize" => NeswResize = 28, + "nwse-resize" => NwseResize = 29, + "col-resize" => ColResize = 30, + "row-resize" => RowResize = 31, + "all-scroll" => AllScroll = 32, + "zoom-in" => ZoomIn = 33, + "zoom-out" => ZoomOut = 34, + ] + // gecko only properties + gecko properties = [ + "-moz-grab" => MozGrab = 35, + "-moz-grabbing" => MozGrabbing = 36, + "-moz-zoom-in" => MozZoomIn = 37, + "-moz-zoom-out" => MozZoomOut = 38, + ] } |