vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allow xdg_role macro configure without braces

This commit is contained in:
Christian Meissl 2021-11-20 17:39:06 +01:00 committed by Victor Berger
parent 717f41817e
commit 4f36e03266
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wayland/shell/xdg/mod.rs
View File

@ -130,7 +130,7 @@ const XDG_TOPLEVEL_STATE_TILED_SINCE: u32 = 2;
macro_rules! xdg_role { macro_rules! xdg_role {
($state:ty, ($state:ty,
$(#[$configure_meta:meta])* $configure_name:ident {$($(#[$configure_field_meta:meta])* $configure_field_vis:vis$configure_field_name:ident:$configure_field_type:ty),*}, $(#[$configure_meta:meta])* $configure_name:ident $({$($(#[$configure_field_meta:meta])* $configure_field_vis:vis$configure_field_name:ident:$configure_field_type:ty),*}),*,
$(#[$attributes_meta:meta])* $attributes_name:ident {$($(#[$attributes_field_meta:meta])* $attributes_field_vis:vis$attributes_field_name:ident:$attributes_field_type:ty),*}) => { $(#[$attributes_meta:meta])* $attributes_name:ident {$($(#[$attributes_field_meta:meta])* $attributes_field_vis:vis$attributes_field_name:ident:$attributes_field_type:ty),*}) => {
$(#[$configure_meta])* $(#[$configure_meta])*
@ -144,10 +144,10 @@ macro_rules! xdg_role {
/// serials. /// serials.
pub serial: Serial, pub serial: Serial,
$( $($(
$(#[$configure_field_meta])* $(#[$configure_field_meta])*
$configure_field_vis $configure_field_name: $configure_field_type, $configure_field_vis $configure_field_name: $configure_field_type,
)* )*)*
} }
$(#[$attributes_meta])* $(#[$attributes_meta])*
@ -274,8 +274,7 @@ xdg_role!(
ToplevelState, ToplevelState,
/// A configure message for toplevel surfaces /// A configure message for toplevel surfaces
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
ToplevelConfigure { ToplevelConfigure,
},
/// Role specific attributes for xdg_toplevel /// Role specific attributes for xdg_toplevel
/// ///
/// This interface defines an xdg_surface role which allows a surface to, /// This interface defines an xdg_surface role which allows a surface to,