diff --git a/hui-examples/assets/fira/FiraSans-Light.ttf b/hui-examples/assets/fira/FiraSans-Light.ttf new file mode 100644 index 0000000..2ad0374 Binary files /dev/null and b/hui-examples/assets/fira/FiraSans-Light.ttf differ diff --git a/hui-examples/assets/fira/LICENSE b/hui-examples/assets/fira/LICENSE new file mode 100644 index 0000000..37c4a30 --- /dev/null +++ b/hui-examples/assets/fira/LICENSE @@ -0,0 +1,94 @@ +Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A. +with Reserved Font Name < Fira >, + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/hui-examples/assets/icons/visual-studio-code-icon_32x32.rgba b/hui-examples/assets/icons/visual-studio-code-icon_32x32.rgba new file mode 100644 index 0000000..b840281 Binary files /dev/null and b/hui-examples/assets/icons/visual-studio-code-icon_32x32.rgba differ diff --git a/hui-examples/examples/vscode_layout.rs b/hui-examples/examples/vscode_layout.rs index 9f6954e..98decd4 100644 --- a/hui-examples/examples/vscode_layout.rs +++ b/hui-examples/examples/vscode_layout.rs @@ -1,12 +1,15 @@ //TODO: finish this demo -use std::time::Instant; use hui::{ color, size, + draw::{ImageHandle, TextureFormat}, layout::{Alignment, Direction}, element::{ container::Container, fill_rect::FillRect, + image::Image, + spacer::Spacer, + text::Text, UiElementExt }, }; @@ -15,15 +18,71 @@ use hui::{ #[macro_use] mod boilerplate; +struct Stuff { + vscode_icon: ImageHandle, +} + ui_main!( "hUI: vscode demo", - init: |_| { - Instant::now() + init: |ui| { + let handle = ui.add_font(include_bytes!("../assets/fira/FiraSans-Light.ttf")); + ui.push_font(handle); + Stuff { + vscode_icon: ui.add_image(TextureFormat::Rgba, include_bytes!("../assets/icons/visual-studio-code-icon_32x32.rgba"), 32), + } }, - run: |ui, size, instant| { + run: |ui, size, stuff| { Container::default() .with_size(size!(100%)) - .with_background(color::WHITE) + .with_children(|ui| { + Container::default() + .with_size(size!(100%, auto)) + .with_direction(Direction::Horizontal) + .with_align((Alignment::Begin, Alignment::Center)) + .with_padding((5., 8.)) + .with_gap(15.) + .with_background(color::rgb_hex(0x3d3c3e)) + .with_children(|ui| { + Image::new(stuff.vscode_icon) + .with_size(size!(auto, 24)) + .add_child(ui); + Spacer(1.).add_child(ui); + for item in ["File", "Edit", "Selection", "View", "Go", "Run", "Terminal", "Help"] { + Text::new(item) + .with_text_size(15) + .add_child(ui); + } + }) + .add_child(ui); + FillRect::default() + .with_size(size!(100%, 1)) + .with_background(color::rgb_hex(0x2d2d30)) + .add_child(ui); + Container::default() + .with_size(size!(100%, 100%)) + .with_direction(Direction::Horizontal) + .with_children(|ui| { + Container::default() + .with_size(size!(48, 100%)) + .with_background(color::rgb_hex(0x343334)) + .add_child(ui); + FillRect::default() + .with_size(size!(1, 100%)) + .with_background(color::rgb_hex(0x2d2d30)) + .add_child(ui); + Container::default() + .with_size(size!(200, 100%)) + .with_padding((15., 8.)) + .with_background(color::rgb_hex(0x1e1e1e)) + .with_children(|ui| { + Text::new("EXPLORER") + .add_child(ui); + }) + .add_child(ui); + }) + .add_child(ui); + + }) .add_root(ui, size); } );