From 8a52fe1d67bb7d493e8e14d0fa869b1961a347cf Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Sun, 24 Mar 2024 02:24:39 +0100 Subject: [PATCH] update `align_test`, drop `rounded_test` --- hui-examples/examples/align_test.rs | 19 ++-- hui-examples/examples/rounded_rect.rs | 141 -------------------------- hui-examples/examples/text_weird.rs | 4 +- 3 files changed, 11 insertions(+), 153 deletions(-) delete mode 100644 hui-examples/examples/rounded_rect.rs diff --git a/hui-examples/examples/align_test.rs b/hui-examples/examples/align_test.rs index 86e4c57..d22de04 100644 --- a/hui-examples/examples/align_test.rs +++ b/hui-examples/examples/align_test.rs @@ -9,8 +9,8 @@ use winit::{ }; use hui::{ element::{ - container::Container, progress_bar::ProgressBar, fill_rect::FillRect, ElementList, UiElement - }, layout::{Alignment, Direction, Size}, rect::{Corners, Sides}, UiInstance + container::Container, fill_rect::FillRect, progress_bar::ProgressBar, ElementList, UiElement + }, frame::FrameRect, layout::{Alignment, Direction, Size}, rect::{Corners, Sides}, UiInstance }; use hui_glium::GliumUiRenderer; @@ -95,7 +95,7 @@ fn main() { Box::new(Container { gap: 5., padding: Sides::all(5.), - background: vec4(0., 0., 0., 0.5).into(), + background_frame: Box::new(FrameRect::color(vec4(0., 0., 0., 0.5))), direction: Direction::Horizontal, children: { let mut x: Vec> = vec![]; @@ -115,19 +115,18 @@ fn main() { ..Default::default() }), Box::new(Container { - background: vec4(1., 0., 0., 1.).into(), + background_frame: Box::new(FrameRect::color((1., 0., 0.)).with_corner_radius(Corners { + top_left: 0., + top_right: 30., + bottom_left: 0., + bottom_right: 0., + })), padding: Sides { top: 10., bottom: 20., left: 30., right: 40., }, - corner_radius: Corners { - top_left: 0., - top_right: 30., - bottom_left: 0., - bottom_right: 0., - }, children: ElementList(vec![ Box::new(FillRect { size: (Size::Absolute(50.), Size::Absolute(50.)).into(), diff --git a/hui-examples/examples/rounded_rect.rs b/hui-examples/examples/rounded_rect.rs deleted file mode 100644 index 81c6487..0000000 --- a/hui-examples/examples/rounded_rect.rs +++ /dev/null @@ -1,141 +0,0 @@ -//WARNING: THIS EXAMPLE IS EXTREMELY OUTDATED AND USES DEPRECATED API - -use glam::{vec4, UVec2}; -use glium::{backend::glutin::SimpleWindowBuilder, Surface}; -use winit::{ - event::{Event, WindowEvent}, - event_loop::{EventLoopBuilder, ControlFlow} -}; -use hui::{ - element::{ - container::Container, - text::Text, ElementList - }, - layout::{Alignment, Direction, Size}, - rect::{Corners, Sides}, - UiInstance -}; -use hui_glium::GliumUiRenderer; - -fn main() { - kubi_logging::init(); - - let event_loop = EventLoopBuilder::new().build().unwrap(); - let (_window, display) = SimpleWindowBuilder::new().build(&event_loop); - - let mut hui = UiInstance::new(); - let mut backend = GliumUiRenderer::new(&display); - event_loop.run(|event, window_target| { - window_target.set_control_flow(ControlFlow::Poll); - match event { - Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => { - window_target.exit(); - }, - Event::AboutToWait => { - let mut frame = display.draw(); - frame.clear_color_srgb(0.5, 0.5, 0.5, 0.); - - let resolution = UVec2::from(display.get_framebuffer_dimensions()).as_vec2(); - - hui.begin(); - - hui.add(Container { - gap: 10., - align: Alignment::Center.into(), - size: (Size::Relative(1.), Size::Relative(1.)).into(), - children: ElementList(vec![ - Box::new(Container { - align: Alignment::Center.into(), - size: (Size::Relative(0.5), Size::Relative(0.5)).into(), - background: vec4(1., 0., 0., 1.).into(), - corner_radius: Corners { - top_left: 10., - top_right: 20., - bottom_left: 50., - bottom_right: 80. - }, - children: ElementList(vec![ - Box::new(Container { - padding: Sides::all(20.), - direction: Direction::Horizontal, - align: Alignment::Center.into(), - size: (Size::Auto, Size::Auto).into(), - background: vec4(0.1, 0.1, 0.1, 0.5).into(), - corner_radius: Corners::all(8.), - children: ElementList(vec![ - Box::new(Text { - text: "Corners".into(), - text_size: 50, - color: vec4(1., 1., 1., 1.), - ..Default::default() - }), - Box::new(Text { - text: "!".into(), - text_size: 50, - color: vec4(1., 1., 0., 1.), - ..Default::default() - }), - ]), - ..Default::default() - }), - ]), - ..Default::default() - }), - Box::new(Container { - gap: 10., - direction: Direction::Horizontal, - children: ElementList(vec![ - Box::new(Container { - size: (Size::Absolute(100.), Size::Absolute(100.)).into(), - background: Corners::left_right( - vec4(1., 0., 0., 1.), - vec4(0., 1., 0., 1.) - ).into(), - corner_radius: Corners::all(0.), - ..Default::default() - }), - Box::new(Container { - size: (Size::Absolute(100.), Size::Absolute(100.)).into(), - background: Corners::left_right( - vec4(1., 0., 0., 1.), - vec4(0., 1., 0., 1.) - ).into(), - corner_radius: Corners::all(10.), - ..Default::default() - }), - Box::new(Container { - size: (Size::Absolute(100.), Size::Absolute(100.)).into(), - background: Corners::left_right( - vec4(1., 0., 0., 1.), - vec4(0., 1., 0., 1.) - ).into(), - corner_radius: Corners::all(20.), - ..Default::default() - }), - Box::new(Container { - size: (Size::Absolute(100.), Size::Absolute(100.)).into(), - background: Corners::left_right( - vec4(1., 0., 0., 1.), - vec4(0., 1., 0., 1.) - ).into(), - corner_radius: Corners::all(30.), - ..Default::default() - }), - ]), - ..Default::default() - }), - ]), - ..Default::default() - }, resolution); - - hui.end(); - - backend.update(&hui); - backend.draw(&mut frame, resolution); - - frame.finish().unwrap(); - } - _ => (), - } - }).unwrap(); -} diff --git a/hui-examples/examples/text_weird.rs b/hui-examples/examples/text_weird.rs index a9222eb..14d98ce 100644 --- a/hui-examples/examples/text_weird.rs +++ b/hui-examples/examples/text_weird.rs @@ -10,7 +10,7 @@ use winit::{ use hui::{ element::{ container::Container, fill_rect::FillRect, spacer::Spacer, text::Text, ElementList - }, layout::Size, UiInstance + }, frame::FrameRect, layout::Size, UiInstance }; use hui_glium::GliumUiRenderer; @@ -49,7 +49,7 @@ fn main() { hui.add(Container { size: (Size::Relative(1.), Size::Relative(1.)).into(), - background: vec4(0.1, 0.1, 0.1, 1.).into(), + background_frame: Box::new(FrameRect::color((0.1, 0.1, 0.1, 1.))), children: elements(|elem| { elem.push(Box::new(Text { text: "THIS LINE SHOULD BE SHARP!".into(),