mirror of
https://github.com/griffi-gh/kubi.git
synced 2024-11-21 22:38:41 -06:00
fix stuff
This commit is contained in:
parent
0af548320b
commit
bf5b05295d
|
@ -1,5 +1,5 @@
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
use glam::{Vec2, IVec2, UVec2};
|
use glam::{Vec2, IVec2, UVec2, vec4};
|
||||||
use glium::{backend::glutin::SimpleWindowBuilder, Surface};
|
use glium::{backend::glutin::SimpleWindowBuilder, Surface};
|
||||||
use winit::{
|
use winit::{
|
||||||
event::{Event, WindowEvent},
|
event::{Event, WindowEvent},
|
||||||
|
@ -7,7 +7,7 @@ use winit::{
|
||||||
};
|
};
|
||||||
use kubi_ui::{
|
use kubi_ui::{
|
||||||
KubiUi,
|
KubiUi,
|
||||||
backend::glium::GliumUiRenderer, element::{progress_bar::ProgressBar, container::{Container, Sides}, UiElement}, UiSize
|
backend::glium::GliumUiRenderer, element::{progress_bar::ProgressBar, container::{Container, Sides, Alignment}, UiElement, rect::Rect}, UiSize, UiDirection
|
||||||
};
|
};
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
|
@ -37,6 +37,7 @@ fn main() {
|
||||||
kui.add(Container {
|
kui.add(Container {
|
||||||
gap: 5.,
|
gap: 5.,
|
||||||
padding: Sides::all(5.),
|
padding: Sides::all(5.),
|
||||||
|
align: (Alignment::Center, Alignment::Center),
|
||||||
elements: vec![
|
elements: vec![
|
||||||
Box::new(ProgressBar {
|
Box::new(ProgressBar {
|
||||||
value: 0.5,
|
value: 0.5,
|
||||||
|
@ -46,6 +47,55 @@ fn main() {
|
||||||
value: instant.elapsed().as_secs_f32().sin().powi(2),
|
value: instant.elapsed().as_secs_f32().sin().powi(2),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
}),
|
}),
|
||||||
|
Box::new(Container {
|
||||||
|
size: (UiSize::Percentage(1.), UiSize::Auto),
|
||||||
|
align: (Alignment::Center, Alignment::End),
|
||||||
|
padding: Sides::all(5.),
|
||||||
|
gap: 10.,
|
||||||
|
elements: vec![
|
||||||
|
Box::new(Rect {
|
||||||
|
size: (UiSize::Percentage(0.5), UiSize::Pixels(30.)),
|
||||||
|
color: Some(vec4(0.75, 0., 0., 1.))
|
||||||
|
}),
|
||||||
|
Box::new(Rect {
|
||||||
|
size: (UiSize::Percentage(instant.elapsed().as_secs_f32().cos().powi(2) / 2. + 0.5), UiSize::Pixels(30.)),
|
||||||
|
color: Some(vec4(0., 0.75, 0., 1.))
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
..Default::default()
|
||||||
|
}),
|
||||||
|
Box::new(Container {
|
||||||
|
gap: 5.,
|
||||||
|
padding: Sides::all(5.),
|
||||||
|
background: Some(vec4(0., 0., 0., 0.5)),
|
||||||
|
direction: UiDirection::Horizontal,
|
||||||
|
elements: {
|
||||||
|
let mut x: Vec<Box<dyn UiElement>> = vec![];
|
||||||
|
for i in 0..10 {
|
||||||
|
x.push(Box::new(Rect {
|
||||||
|
size: (UiSize::Pixels(50.), UiSize::Pixels(50.)),
|
||||||
|
color: if i == 1 {
|
||||||
|
Some(vec4(0.75, 0.75, 0.75, 0.75))
|
||||||
|
} else {
|
||||||
|
Some(vec4(0.5, 0.5, 0.5, 0.75))
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
x
|
||||||
|
},
|
||||||
|
..Default::default()
|
||||||
|
}),
|
||||||
|
Box::new(Container {
|
||||||
|
background: Some(vec4(1., 0., 0., 1.)),
|
||||||
|
padding: Sides::horizontal_vertical(30., 5.),
|
||||||
|
elements: vec![
|
||||||
|
Box::new(Rect {
|
||||||
|
size: (UiSize::Pixels(50.), UiSize::Pixels(50.)),
|
||||||
|
color: Some(vec4(1., 1., 1., 0.75))
|
||||||
|
})
|
||||||
|
],
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
],
|
],
|
||||||
..Default::default()
|
..Default::default()
|
||||||
}, resolution);
|
}, resolution);
|
||||||
|
|
|
@ -9,6 +9,7 @@ use crate::{
|
||||||
element::UiElement
|
element::UiElement
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
|
||||||
pub enum Alignment {
|
pub enum Alignment {
|
||||||
Begin,
|
Begin,
|
||||||
Center,
|
Center,
|
||||||
|
@ -51,8 +52,9 @@ impl<T: Clone> Sides<T> {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Container {
|
pub struct Container {
|
||||||
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 direction: UiDirection,
|
pub direction: UiDirection,
|
||||||
//pub reverse: bool,
|
//pub reverse: bool,
|
||||||
pub gap: f32,
|
pub gap: f32,
|
||||||
|
@ -67,13 +69,15 @@ pub struct Container {
|
||||||
impl Default for Container {
|
impl Default for Container {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
min_size: (UiSize::Auto, UiSize::Auto),
|
// min_size: (UiSize::Auto, UiSize::Auto),
|
||||||
max_size: (UiSize::Auto, UiSize::Auto),
|
// max_size: (UiSize::Auto, UiSize::Auto),
|
||||||
|
size: (UiSize::Auto, UiSize::Auto),
|
||||||
direction: UiDirection::Vertical,
|
direction: UiDirection::Vertical,
|
||||||
//reverse: false,
|
//reverse: false,
|
||||||
gap: 0.,
|
gap: 0.,
|
||||||
padding: Sides::all(0.),
|
padding: Sides::all(0.),
|
||||||
align: (Alignment::Center, Alignment::Begin),
|
///Primary/secondary axis
|
||||||
|
align: (Alignment::Begin, Alignment::Begin),
|
||||||
background: Default::default(),
|
background: Default::default(),
|
||||||
borders: Default::default(),
|
borders: Default::default(),
|
||||||
clip: Default::default(),
|
clip: Default::default(),
|
||||||
|
@ -83,7 +87,7 @@ impl Default for Container {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Container {
|
impl Container {
|
||||||
pub fn measure_max_size(&self, layout: &LayoutInfo) -> Vec2 {
|
pub fn measure_max_inner_size(&self, layout: &LayoutInfo) -> Vec2 {
|
||||||
layout.max_size - vec2(
|
layout.max_size - vec2(
|
||||||
self.padding.left + self.padding.right,
|
self.padding.left + self.padding.right,
|
||||||
self.padding.top + self.padding.bottom,
|
self.padding.top + self.padding.bottom,
|
||||||
|
@ -94,27 +98,43 @@ impl Container {
|
||||||
impl UiElement for Container {
|
impl UiElement for Container {
|
||||||
fn measure(&self, state: &StateRepo, layout: &LayoutInfo) -> Response {
|
fn measure(&self, state: &StateRepo, layout: &LayoutInfo) -> Response {
|
||||||
let mut size = Vec2::ZERO;
|
let mut size = Vec2::ZERO;
|
||||||
let mut leftover_gap = Vec2::ZERO;
|
if matches!(self.size.0, UiSize::Auto) || matches!(self.size.1, UiSize::Auto) {
|
||||||
for element in &self.elements {
|
let mut leftover_gap = Vec2::ZERO;
|
||||||
let measure = element.measure(state, &LayoutInfo {
|
for element in &self.elements {
|
||||||
position: layout.position + size,
|
let measure = element.measure(state, &LayoutInfo {
|
||||||
max_size: self.measure_max_size(layout), // - size TODO
|
position: layout.position + size,
|
||||||
direction: self.direction,
|
max_size: self.measure_max_inner_size(layout), // - size TODO
|
||||||
});
|
direction: self.direction,
|
||||||
match self.direction {
|
});
|
||||||
UiDirection::Horizontal => {
|
match self.direction {
|
||||||
size.x += measure.desired_size.x + self.gap;
|
UiDirection::Horizontal => {
|
||||||
size.y = size.y.max(measure.desired_size.y);
|
size.x += measure.desired_size.x + self.gap;
|
||||||
leftover_gap.x = self.gap;
|
size.y = size.y.max(measure.desired_size.y);
|
||||||
},
|
leftover_gap.x = self.gap;
|
||||||
UiDirection::Vertical => {
|
},
|
||||||
size.x = size.x.max(measure.desired_size.x);
|
UiDirection::Vertical => {
|
||||||
size.y += measure.desired_size.y + self.gap;
|
size.x = size.x.max(measure.desired_size.x);
|
||||||
leftover_gap.y = self.gap;
|
size.y += measure.desired_size.y + self.gap;
|
||||||
|
leftover_gap.y = self.gap;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
size -= leftover_gap;
|
||||||
|
size += vec2(
|
||||||
|
self.padding.left + self.padding.right,
|
||||||
|
self.padding.top + self.padding.bottom,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
match self.size.0 {
|
||||||
|
UiSize::Auto => (),
|
||||||
|
UiSize::Percentage(percentage) => size.x = layout.max_size.x * percentage,
|
||||||
|
UiSize::Pixels(pixels) => size.x = pixels,
|
||||||
|
}
|
||||||
|
match self.size.1 {
|
||||||
|
UiSize::Auto => (),
|
||||||
|
UiSize::Percentage(percentage) => size.y = layout.max_size.y * percentage,
|
||||||
|
UiSize::Pixels(pixels) => size.y = pixels,
|
||||||
}
|
}
|
||||||
size -= leftover_gap;
|
|
||||||
Response { desired_size: size }
|
Response { desired_size: size }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -157,17 +177,34 @@ impl UiElement for Container {
|
||||||
for element in &self.elements {
|
for element in &self.elements {
|
||||||
//(passing max size from layout rather than actual bounds for the sake of consistency with measure() above)
|
//(passing max size from layout rather than actual bounds for the sake of consistency with measure() above)
|
||||||
|
|
||||||
let layout = LayoutInfo {
|
let mut el_layout = LayoutInfo {
|
||||||
position,
|
position,
|
||||||
max_size: self.measure_max_size(layout),
|
max_size: self.measure_max_inner_size(layout),
|
||||||
direction: self.direction,
|
direction: self.direction,
|
||||||
};
|
};
|
||||||
|
|
||||||
//measure
|
//measure
|
||||||
let el_measure = element.measure(state, &layout);
|
let el_measure = element.measure(state, &el_layout);
|
||||||
|
|
||||||
|
//align (on sec. axis)
|
||||||
|
match (self.align.1, self.direction) {
|
||||||
|
(Alignment::Begin, _) => (),
|
||||||
|
(Alignment::Center, UiDirection::Horizontal) => {
|
||||||
|
el_layout.position.y += (measure.desired_size.y - self.padding.bottom - self.padding.top - el_measure.desired_size.y) / 2.;
|
||||||
|
},
|
||||||
|
(Alignment::Center, UiDirection::Vertical) => {
|
||||||
|
el_layout.position.x += (measure.desired_size.x - self.padding.left - self.padding.right - el_measure.desired_size.x) / 2.;
|
||||||
|
},
|
||||||
|
(Alignment::End, UiDirection::Horizontal) => {
|
||||||
|
el_layout.position.y += measure.desired_size.y - el_measure.desired_size.y - self.padding.bottom;
|
||||||
|
},
|
||||||
|
(Alignment::End, UiDirection::Vertical) => {
|
||||||
|
el_layout.position.x += measure.desired_size.x - el_measure.desired_size.x - self.padding.right;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//process
|
//process
|
||||||
element.process(&el_measure, state, &layout, draw);
|
element.process(&el_measure, state, &el_layout, draw);
|
||||||
|
|
||||||
//layout
|
//layout
|
||||||
match self.direction {
|
match self.direction {
|
||||||
|
|
Loading…
Reference in a new issue