voxel/hUI
voxel/hUI
1
1
Fork 0
mirror of https://github.com/griffi-gh/hUI.git synced 2024-11-25 08:28:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor rect_frame macro

Browse source
This commit is contained in:
griffi-gh 2024-04-17 16:00:27 +02:00
parent d82eb2eeb1
commit eda2ddcc0f
1 changed files with 11 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
hui/src/macros.rs
View file

@ -79,7 +79,7 @@ macro_rules! size {
/// ///
/// # Example: /// # Example:
/// ``` /// ```
/// frame_rect! { /// _frame! {
/// color: (0.2, 0.2, 0.3, 1.), /// color: (0.2, 0.2, 0.3, 1.),
/// corner_radius: 5., /// corner_radius: 5.,
/// }; /// };
@ -100,8 +100,8 @@ macro_rules! rect_frame {
($expr:expr) => { ($expr:expr) => {
{ {
let _frame_rect: $crate::frame::RectFrame = $crate::frame::RectFrame::from($expr); let __frame: $crate::frame::RectFrame = $crate::frame::RectFrame::from($expr);
_frame_rect __frame
} }
}; };
@ -117,56 +117,22 @@ macro_rules! rect_frame {
// construct the RectFrame // construct the RectFrame
{ {
let mut frame_rect = $crate::frame::RectFrame::default(); let mut _frame = $crate::frame::RectFrame::default();
let mut _color_is_set = false; let mut _color_is_set = false;
let mut _image_is_set = false; let mut _image_is_set = false;
$( $(
{ {
frame_rect.$ident = ($expr).into(); _frame.$ident = ($expr).into();
if stringify!($ident) == "image" { _image_is_set |= stringify!($ident) == "image";
_image_is_set = true; _color_is_set |= stringify!($ident) == "color";
}
if stringify!($ident) == "color" {
_color_is_set = true;
}
} }
)+ )+
if frame_rect.image.is_some() && _image_is_set && !_color_is_set { // set color to white if image is set but color is left as default
frame_rect.color = (1., 1., 1., 1.).into(); if _frame.image.is_some() && _image_is_set && !_color_is_set {
_frame.color = (1., 1., 1., 1.).into();
} }
frame_rect _frame
} }
} }
}; };
// {$from:expr, $($ident:ident : $expr:expr),+$(,)?} => {
// {
// // ensure all identifiers are unique
// #[allow(non_upper_case_globals)]
// {
// $(
// const $ident: () = ();
// )+
// }
// // construct the RectFrame
// {
// let mut _frame_rect: $crate::frame::RectFrame = ($from).into();
// $(
// let $ident = ($expr).into();
// _frame_rect.$ident = $ident;
// )+
// _frame_rect
// }
// }
// };
} }
// #[allow(unused)]
// fn test() {
// // let _ = frame_rect!(5, 6);
// let _ = frame_rect! {
// color: (0.2, 0.2, 0.3, 1.),
// corner_radius: 5.,
// };
// }