voxel/hUI
voxel/hUI
1
1
Fork 0
mirror of https://github.com/griffi-gh/hUI.git synced 2024-11-22 15:18:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove unused border code

Browse source
This commit is contained in:
griffi-gh 2024-02-20 20:27:05 +01:00
parent f12a59fd31
commit fc25818e6b
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
hui/src/element/builtin/button.rs Normal file
View file

21
hui/src/element/builtin/container.rs
View file

@ -3,25 +3,29 @@ use crate::{
draw::{RoundedCorners, UiDrawCommand}, element::{MeasureContext, ProcessContext, UiElement}, layout::{Alignment, Alignment2d, LayoutInfo, UiDirection, UiSize}, measure::{Hints, Response}, rectangle::{Corners, Sides} draw::{RoundedCorners, UiDrawCommand}, element::{MeasureContext, ProcessContext, UiElement}, layout::{Alignment, Alignment2d, LayoutInfo, UiDirection, UiSize}, measure::{Hints, Response}, rectangle::{Corners, Sides}
}; };
pub struct Border { // pub struct Border {
pub color: Vec4, // pub color: Vec4,
pub width: f32, // pub width: f32,
} // }
///XXX: add Order/Direction::Forward/Reverse or sth?
pub struct Container { pub struct Container {
//TODO: min/max size
// pub min_size: (UiSize, UiSize), // pub min_size: (UiSize, UiSize),
// pub max_size: (UiSize, UiSize), // pub max_size: (UiSize, UiSize),
pub size: (UiSize, UiSize), pub size: (UiSize, UiSize),
pub direction: UiDirection, pub direction: UiDirection,
//pub reverse: bool,
pub gap: f32, pub gap: f32,
pub padding: Sides<f32>, pub padding: Sides<f32>,
///Primary/secondary axis ///Primary/secondary axis
pub align: Alignment2d, pub align: Alignment2d,
pub background: Vec4, pub background: Vec4,
pub borders: Sides<Option<Border>>, //TODO: borders
//pub borders: Sides<Option<Border>>,
pub corner_radius: Corners<f32>, pub corner_radius: Corners<f32>,
//pub clip: bool, //TODO: clip children //TODO: clip children
//pub clip: bool,
pub elements: Vec<Box<dyn UiElement>>, pub elements: Vec<Box<dyn UiElement>>,
} }
@ -32,12 +36,11 @@ impl Default for Container {
// max_size: (UiSize::Auto, UiSize::Auto), // max_size: (UiSize::Auto, UiSize::Auto),
size: (UiSize::Auto, UiSize::Auto), size: (UiSize::Auto, UiSize::Auto),
direction: UiDirection::Vertical, direction: UiDirection::Vertical,
//reverse: false,
gap: 0., gap: 0.,
padding: Sides::all(0.), padding: Sides::all(0.),
align: Alignment2d::default(), align: Alignment2d::default(),
background: Default::default(), background: Default::default(),
borders: Default::default(), //borders: Default::default(),
elements: Vec::new(), elements: Vec::new(),
corner_radius: Corners::all(0.), corner_radius: Corners::all(0.),
} }