rzerres/advotracker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples: advowidgets: update to upstream orbtk example

Browse Source 
Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
Ralf Zerres
2020-07-24 20:55:11 +02:00
parent 094fb6d0ea
commit 9b9afc2b5a
1 changed files with 112 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

203
advotracker/examples/advowidgets.rs
View File

@@ -11,6 +11,7 @@ enum Action {
ValueChanged(Entity), ValueChanged(Entity),
IncrementCounter, IncrementCounter,
RemoveItem, RemoveItem,
ToggleTheme(Entity),
} }
#[derive(AsAny)] #[derive(AsAny)]
@@ -31,7 +32,7 @@ impl MainViewState {
} }
impl State for MainViewState { impl State for MainViewState {
fn update(&mut self, _: &mut Registry, ctx: &mut Context<'_>) { fn update(&mut self, _: &mut Registry, ctx: &mut Context) {
if let Some(action) = self.action { if let Some(action) = self.action {
match action { match action {
Action::AddItem => { Action::AddItem => {
@@ -48,7 +49,8 @@ impl State for MainViewState {
if len == 4 { if len == 4 {
button(ctx.child("add-item-button")).set_enabled(false); button(ctx.child("add-item-button")).set_enabled(false);
button(ctx.child("add-item-button")).set_visibility(Visibility::Collapsed); button(ctx.child("add-item-button"))
.set_visibility(Visibility::Collapsed);
} }
} }
} }
@@ -62,7 +64,9 @@ impl State for MainViewState {
if len == 1 { if len == 1 {
button(ctx.child("remove-item-button")).set_enabled(false); button(ctx.child("remove-item-button")).set_enabled(false);
button(ctx.child("remove-item-button")).set_visibility(Visibility::Collapsed); } button(ctx.child("remove-item-button"))
.set_visibility(Visibility::Collapsed);
}
} }
} }
Action::IncrementCounter => { Action::IncrementCounter => {
@@ -86,10 +90,14 @@ impl State for MainViewState {
Action::EntryChanged(entity) => { Action::EntryChanged(entity) => {
println!("entry changed: {}", text_box(ctx.get_widget(entity)).text()); println!("entry changed: {}", text_box(ctx.get_widget(entity)).text());
} }
Action::ValueChanged(entity) => { Action::ValueChanged(_entity) => {
let val = ((slider(ctx.get_widget(entity)).val()).floor() as i32).to_string(); //println!("Slider value changed");
}
Action::ToggleTheme(entity) => {
let light = *ctx.get_widget(entity).get::<bool>("selected");
text_block(ctx.child("value_text")).set_text(String16::from(val)); let theme = if light { light_theme() } else { dark_theme() };
ctx.switch_theme(theme);
} }
} }
@@ -97,7 +105,7 @@ impl State for MainViewState {
} }
} }
fn update_post_layout(&mut self, _: &mut Registry, ctx: &mut Context<'_>) { fn update_post_layout(&mut self, _: &mut Registry, ctx: &mut Context) {
let mut selection_string = "Selected:".to_string(); let mut selection_string = "Selected:".to_string();
for index in &main_view(ctx.widget()).selected_indices().0 { for index in &main_view(ctx.widget()).selected_indices().0 {
@@ -109,11 +117,7 @@ impl State for MainViewState {
} }
fn create_header(ctx: &mut BuildContext, text: &str) -> Entity { fn create_header(ctx: &mut BuildContext, text: &str) -> Entity {
TextBlock::new() TextBlock::new().text(text).style("header").build(ctx)
.text(text)
.element("text-block")
.class("h1")
.build(ctx)
} }
type List = Vec<String>; type List = Vec<String>;
@@ -136,6 +140,14 @@ widget!(
impl Template for MainView { impl Template for MainView {
fn template(self, id: Entity, ctx: &mut BuildContext) -> Self { fn template(self, id: Entity, ctx: &mut BuildContext) -> Self {
let slider = Slider::new()
.min(0.0)
.max(1.0)
.on_changed(move |states, entity| {
state(id, states).action(Action::ValueChanged(entity));
})
.build(ctx);
self.name("MainView") self.name("MainView")
.result("Button count: 0") .result("Button count: 0")
.counter(0) .counter(0)
@@ -147,16 +159,16 @@ impl Template for MainView {
]) ])
.list_count(3) .list_count(3)
.selection_list(vec![ .selection_list(vec![
"Item 1".to_string(), "Select Item 1".to_string(),
"Item 2".to_string(), "Select Item 2".to_string(),
"Item 3".to_string(), "Select Item 3".to_string(),
"Item 4".to_string(), "Select Item 4".to_string(),
"Item 5".to_string(), "Select Item 5".to_string(),
"Item 6".to_string(), "Select Item 6".to_string(),
"Item 7".to_string(), "Select Item 7".to_string(),
"Item 8".to_string(), "Select Item 8".to_string(),
"Item 9".to_string(), "Select Item 9".to_string(),
"Item 10".to_string(), "Select Item 10".to_string(),
]) ])
.combo_box_list(vec![ .combo_box_list(vec![
"CB 1".to_string(), "CB 1".to_string(),
@@ -174,24 +186,20 @@ impl Template for MainView {
.combo_box_list_count(10) .combo_box_list_count(10)
.child( .child(
Grid::new() Grid::new()
.margin(8.) .margin(8)
.columns( .columns(Columns::new().add(132).add(16).add(132).add(16).add(132))
Columns::new() .rows(Rows::new().add("*").add(32))
.add(132.)
.add(16.)
.add(132.)
.add(16.)
.add(132.),
)
.child( .child(
// Row 0
Stack::new() Stack::new()
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(0))
// Column 0 // Column 0
.child(create_header(ctx, "Buttons")) .child(create_header(ctx, "Buttons"))
.child( .child(
Button::new() Button::new()
.text("Button") .text("Button")
.margin((0., 8., 0., 0.)) .margin((0, 8, 0, 0))
.icon(material_icons_font::MD_CHECK) .icon(material_icons_font::MD_CHECK)
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(1)) .attach(Grid::row(1))
@@ -204,9 +212,8 @@ impl Template for MainView {
.child( .child(
Button::new() Button::new()
.text("Primary") .text("Primary")
.element("button") .style("button_primary")
.class("primary") .margin((0, 8, 0, 0))
.margin((0., 8., 0., 0.))
.icon(material_icons_font::MD_360) .icon(material_icons_font::MD_360)
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(2)) .attach(Grid::row(2))
@@ -214,9 +221,9 @@ impl Template for MainView {
) )
.child( .child(
ToggleButton::new() ToggleButton::new()
.class("single_content") .style("button_single_content")
.text("ToggleButton") .text("ToggleButton")
.margin((0., 8., 2., 0.)) .margin((0, 8, 2, 0))
.icon(material_icons_font::MD_ALARM_ON) .icon(material_icons_font::MD_ALARM_ON)
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(3)) .attach(Grid::row(3))
@@ -225,45 +232,38 @@ impl Template for MainView {
.child( .child(
CheckBox::new() CheckBox::new()
.text("CheckBox") .text("CheckBox")
.margin((0., 8., 0., 0.)) .margin((0, 8, 0, 0))
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(4)) .attach(Grid::row(4))
.build(ctx), .build(ctx),
) )
.child( .child(
Switch::new() Switch::new()
.margin((0., 8., 0., 0.)) .margin((0, 8, 0, 0))
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(5)) .attach(Grid::row(5))
.build(ctx), .build(ctx),
) )
.child(slider)
.child( .child(
TextBlock::new() ProgressBar::new()
.margin((0., 8., 0., 0.)) .val(slider)
.element("h1") .margin((0, 8, 0, 0))
.id("value_text")
.text("0")
.h_align("center")
.build(ctx),
)
.child(
Slider::new()
.on_changed(move |states, entity| {
state(id, states).action(Action::ValueChanged(entity));
})
.build(ctx), .build(ctx),
) )
.build(ctx), .build(ctx),
) )
.child( .child(
Stack::new() Stack::new()
// Column 2
.attach(Grid::column(2)) .attach(Grid::column(2))
.attach(Grid::row(0))
.child(create_header(ctx, "Text")) .child(create_header(ctx, "Text"))
.child( .child(
TextBlock::new() TextBlock::new()
.class("body") .style("body")
.text(("result", id)) .text(("result", id))
.margin((0., 8., 0., 0.)) .margin((0, 8, 0, 0))
.attach(Grid::column(2)) .attach(Grid::column(2))
.attach(Grid::row(1)) .attach(Grid::row(1))
.build(ctx), .build(ctx),
@@ -272,7 +272,7 @@ impl Template for MainView {
TextBox::new() TextBox::new()
.water_mark("TextBox...") .water_mark("TextBox...")
.text(("text_one", id)) .text(("text_one", id))
.margin((0., 8., 0., 0.)) .margin((0, 8, 0, 0))
.attach(Grid::column(2)) .attach(Grid::column(2))
.attach(Grid::row(2)) .attach(Grid::row(2))
.on_activate(move |states, entity| { .on_activate(move |states, entity| {
@@ -287,7 +287,7 @@ impl Template for MainView {
TextBox::new() TextBox::new()
.water_mark("TextBox...") .water_mark("TextBox...")
.text(("text_two", id)) .text(("text_two", id))
.margin((0., 8., 0., 0.)) .margin((0, 8, 0, 0))
.attach(Grid::column(2)) .attach(Grid::column(2))
.attach(Grid::row(2)) .attach(Grid::row(2))
.on_activate(move |states, entity| { .on_activate(move |states, entity| {
@@ -300,11 +300,10 @@ impl Template for MainView {
) )
.child( .child(
Button::new() Button::new()
.margin((0., 8., 0., 0.)) .margin((0, 8, 0, 0))
.class("single_content") .style("button_single_content")
.margin((0., 8., 8., 0.))
.icon(material_icons_font::MD_CLEAR)
.text("clear text") .text("clear text")
.icon(material_icons_font::MD_CLEAR)
.on_click(move |states, _| { .on_click(move |states, _| {
state(id, states).action(Action::ClearText); state(id, states).action(Action::ClearText);
true true
@@ -313,8 +312,8 @@ impl Template for MainView {
) )
.child( .child(
NumericBox::new() NumericBox::new()
.margin((-0., 8., 0., 0.)) .margin((0, 8, 0, 0))
.max(123.) .max(123)
.step(0.123) .step(0.123)
.val(0.123) .val(0.123)
.build(ctx), .build(ctx),
@@ -322,24 +321,25 @@ impl Template for MainView {
.build(ctx), .build(ctx),
) )
.child( .child(
// Column 4
Grid::new() Grid::new()
.rows( .rows(
Rows::new() Rows::new()
.add("auto") .add("auto")
.add(32.) .add(32)
.add(16.) .add(16)
.add(204.) .add(204)
.add("auto") .add("auto")
.add(192.) .add(192)
.add("auto"), .add("auto"),
) )
.columns(Columns::new().add("*").add(4.).add("*")) .columns(Columns::new().add("*").add(4).add("*"))
.attach(Grid::column(4)) .attach(Grid::column(4))
.attach(Grid::row(0))
.child( .child(
TextBlock::new() TextBlock::new()
.text("Items") .text("Items")
.element("text-block") .style("header")
.class("h1")
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::column_span(3)) .attach(Grid::column_span(3))
.attach(Grid::row(0)) .attach(Grid::row(0))
@@ -353,7 +353,8 @@ impl Template for MainView {
.get::<Vec<String>>("combo_box_list")[index] .get::<Vec<String>>("combo_box_list")[index]
.clone(); .clone();
TextBlock::new() TextBlock::new()
.margin((0., 0., 0., 2.)) .style("small_text")
.margin((0, 0, 0, 2))
.v_align("center") .v_align("center")
.text(text) .text(text)
.build(bc) .build(bc)
@@ -362,58 +363,53 @@ impl Template for MainView {
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::column_span(3)) .attach(Grid::column_span(3))
.attach(Grid::row(1)) .attach(Grid::row(1))
.margin((0., 8., 0., 0.)) .margin((0, 8, 0, 0))
.count(("combo_box_list_count", id)) .count(("combo_box_list_count", id))
.build(ctx), .build(ctx),
) )
.child( .child(
ItemsWidget::new() ItemsWidget::new()
.element("items-widget")
.id("items") .id("items")
.padding((4., 4., 4., 2.)) .padding((4, 4, 4, 2))
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::column_span(3)) .attach(Grid::column_span(3))
.attach(Grid::row(3)) .attach(Grid::row(3))
.margin((0., 0., 0., 8.)) .margin((0, 0, 0, 8))
// bc = build-context
.items_builder(move |bc, index| { .items_builder(move |bc, index| {
let text = bc.get_widget(id).get::<Vec<String>>("list") let text = bc.get_widget(id).get::<Vec<String>>("list")
[index] [index]
.clone(); .clone();
Button::new() Button::new().margin((0, 0, 0, 2)).text(text).build(bc)
.margin((0., 0., 0., 2.))
.text(text)
.build(bc)
}) })
.count(("list_count", id)) .count(("list_count", id))
.build(ctx), .build(ctx),
) )
.child( .child(
Button::new() Button::new()
.element("button") .style("button_single_content")
.class("single_content")
.id("remove-item-button") .id("remove-item-button")
.icon(material_icons_font::MD_REMOVE_CIRCLE) .icon(material_icons_font::MD_REMOVE_CIRCLE)
.on_click(move |states, _| { .on_click(move |states, _| {
state(id, states).action(Action::RemoveItem); state(id, states).action(Action::RemoveItem);
true true
}) })
.min_width(0.) .min_width(0)
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(4)) .attach(Grid::row(4))
.build(ctx), .build(ctx),
) )
.child( .child(
Button::new() Button::new()
.element("button") .style("button_single_content")
.class("single_content")
.id("add-item-button") .id("add-item-button")
.icon(material_icons_font::MD_ADD_CIRCLE) .icon(material_icons_font::MD_ADD_CIRCLE)
.on_click(move |states, _| { .on_click(move |states, _| {
state(id, states).action(Action::AddItem); state(id, states).action(Action::AddItem);
true true
}) })
.min_width(0.) .min_width(0)
.attach(Grid::column(2)) .attach(Grid::column(2))
.attach(Grid::row(4)) .attach(Grid::row(4))
.build(ctx), .build(ctx),
@@ -424,27 +420,28 @@ impl Template for MainView {
.attach(Grid::column_span(3)) .attach(Grid::column_span(3))
.attach(Grid::row(5)) .attach(Grid::row(5))
.selected_indices(id) .selected_indices(id)
.margin((0., 16., 0., 8.)) .margin((0, 16, 0, 8))
.items_builder(move |bc, index| { .items_builder(move |bc, index| {
let text = bc let text = bc
.get_widget(id) .get_widget(id)
.get::<Vec<String>>("selection_list")[index] .get::<Vec<String>>("selection_list")[index]
.clone(); .clone();
TextBlock::new() TextBlock::new()
.margin((0., 0., 0., 2.)) .margin((0, 0, 0, 2))
.v_align("center") .v_align("center")
.text(text) .text(text)
.build(bc) .build(bc)
}) })
.on_selection_changed(|_, _, _| println!("Selection changed"))
.count(("selection_list_count", id)) .count(("selection_list_count", id))
.build(ctx), .build(ctx),
) )
.child( .child(
// todo: wrong text width???? // todo: wrong text width????
TextBlock::new() TextBlock::new()
.element("text-block") .style("body")
.id("selection") .id("selection")
.max_width(120.) .max_width(120)
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::column_span(3)) .attach(Grid::column_span(3))
.attach(Grid::row(6)) .attach(Grid::row(6))
@@ -453,6 +450,30 @@ impl Template for MainView {
) )
.build(ctx), .build(ctx),
) )
.child(
// Row 1
Stack::new()
.orientation("horizontal")
.attach(Grid::row(1))
.attach(Grid::column(0))
.child(
TextBlock::new()
.style("body")
.text("Toggle theme: ")
.v_align("center")
.margin((0, 0, 4, 0))
.build(ctx),
)
.child(
Switch::new()
.on_changed(move |states, entity| {
state(id, states).action(Action::ToggleTheme(entity));
})
.v_align("center")
.build(ctx),
)
.build(ctx),
)
.build(ctx), .build(ctx),
) )
} }
@@ -460,14 +481,14 @@ impl Template for MainView {
fn main() { fn main() {
// use this only if you want to run it as web application. // use this only if you want to run it as web application.
//orbtk::initialize(); orbtk::initialize();
Application::new() Application::new()
.window(|ctx| { .window(|ctx| {
Window::new() Window::new()
.title("OrbTk - widgets example") .title("OrbTk - widgets example")
.position((100., 100.)) .position((100, 100))
.size(468., 730.) .size(468, 730)
.resizeable(true) .resizeable(true)
.child(MainView::new().build(ctx)) .child(MainView::new().build(ctx))
.build(ctx) .build(ctx)