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

examples: advowidgets: update to new api syntax

Browse Source 
* when addressing widgets properties the new api syntax
  seems more natural. It accesses the properties via a function
  oriented notation:

  - view_name(<ctx.widget()).<entity>_mut()

  - ctx.child("<entity>").set::<type>("<field>", <new_property>)

  - <widget_class>(ctx.child(<entity)).set_<field>(<new_property>)

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
Ralf Zerres
2020-07-02 07:23:23 +02:00
parent 31b45ab690
commit 8d7d5176d9
1 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
advotracker/examples/advowidgets.rs
View File

@@ -35,60 +35,58 @@ impl State for MainViewState {
if let Some(action) = self.action { if let Some(action) = self.action {
match action { match action {
Action::AddItem => { Action::AddItem => {
let len = ctx.widget().get::<List>("list").len(); let len = main_view(ctx.widget()).list().len();
if len < 5 { if len < 5 {
ctx.widget() main_view(ctx.widget())
.get_mut::<List>("list") .list_mut()
.push(format!("Item {}", len + 1)); .push(format!("Item {}", len + 1));
ctx.child("items").set("count", len + 1); ctx.child("items").set::<usize>("blub", len + 1);
ctx.child("remove-item-button").set("enabled", true); items_widget(ctx.child("items")).set_count(len + 1);
button(ctx.child("remove-item-button")).set_enabled(true);
if len == 4 { if len == 4 {
ctx.child("add-item-button").set("enabled", false); button(ctx.child("add-item-button")).set_enabled(false);
} }
} }
} }
Action::RemoveItem => { Action::RemoveItem => {
let len = ctx.widget().get::<List>("list").len(); let len = main_view(ctx.widget()).list().len();
if len > 0 { if len > 0 {
ctx.widget().get_mut::<List>("list").remove(len - 1); main_view(ctx.widget()).list_mut().remove(len - 1);
ctx.child("items").set("count", len - 1); items_widget(ctx.child("items")).set_count(len - 1);
ctx.child("add-item-button").set("enabled", true); button(ctx.child("add-item-button")).set_enabled(true);
if len == 1 { if len == 1 {
ctx.child("remove-item-button").set("enabled", false); button(ctx.child("remove-item-button")).set_enabled(false);
} }
} }
} }
Action::IncrementCounter => { Action::IncrementCounter => {
*ctx.widget().get_mut::<usize>("counter") += 1; *main_view(ctx.widget()).counter_mut() += 1;
let counter = *ctx.widget().get::<usize>("counter"); let counter = *main_view(ctx.widget()).counter();
ctx.widget().set( main_view(ctx.widget())
"result", .set_result(String16::from(format!("Button count: {}", counter)));
String16::from(format!("Button count: {}", counter)),
);
} }
Action::ClearText => { Action::ClearText => {
ctx.widget().set("text_one", String16::from("")); main_view(ctx.widget()).set_text_one(String16::default());
ctx.widget().set("text_two", String16::from("")); main_view(ctx.widget()).set_text_two(String16::default());
} }
Action::EntryActivated(entity) => { Action::EntryActivated(entity) => {
let mut widget = ctx.get_widget(entity); let mut text_box = text_box(ctx.get_widget(entity));
let text = widget.get_mut::<String16>("text"); let text = text_box.text_mut();
println!("submitting {}", text); println!("submitting {}", text);
text.clear(); text.clear();
} }
Action::EntryChanged(entity) => { Action::EntryChanged(entity) => {
let widget = ctx.get_widget(entity); println!("entry changed: {}", text_box(ctx.get_widget(entity)).text());
let text = widget.get::<String16>("text");
println!("entry changed: {}", text);
} }
Action::ValueChanged(entity) => { Action::ValueChanged(entity) => {
let val = let val = ((slider(ctx.get_widget(entity)).val()).floor() as i32).to_string();
((*ctx.get_widget(entity).get::<f64>("val")).floor() as i32).to_string();
ctx.child("value_text").set("text", String16::from(val)); text_block(ctx.child("value_text")).set_text(String16::from(val));
} }
} }
@@ -99,12 +97,11 @@ 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 &ctx.widget().get::<SelectedIndices>("selected_indices").0 { for index in &main_view(ctx.widget()).selected_indices().0 {
selection_string = format!("{} {}", selection_string, index); selection_string = format!("{} {}", selection_string, index);
} }
ctx.child("selection") text_block(ctx.child("selection")).set_text(selection_string);
.set("text", String16::from(selection_string));
} }
} }
@@ -174,14 +171,14 @@ impl Template for MainView {
.combo_box_list_count(10) .combo_box_list_count(10)
.child( .child(
Grid::new() Grid::new()
.margin(8.0) .margin(8.)
.columns( .columns(
Columns::new() Columns::new()
.add(132.0) .add(132.)
.add(16.0) .add(16.)
.add(132.0) .add(132.)
.add(16.0) .add(16.)
.add(132.0), .add(132.),
) )
.child( .child(
Stack::new() Stack::new()
@@ -191,8 +188,8 @@ impl Template for MainView {
.child( .child(
Button::new() Button::new()
.text("Button") .text("Button")
.margin((0.0, 8.0, 0.0, 0.0)) .margin((0., 8., 0., 0.))
.icon(material_font_icons::CHECK_FONT_ICON) .icon(material_icons_font_ttf::MD_CHECK)
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(1)) .attach(Grid::row(1))
.on_click(move |states, _| { .on_click(move |states, _| {
@@ -206,8 +203,8 @@ impl Template for MainView {
.text("Primary") .text("Primary")
.element("button") .element("button")
.class("primary") .class("primary")
.margin((0.0, 8.0, 0.0, 0.0)) .margin((0., 8., 0., 0.))
.icon(material_font_icons::CHECK_FONT_ICON) .icon(material_icons_font_ttf::MD_360)
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(2)) .attach(Grid::row(2))
.build(ctx), .build(ctx),
@@ -216,7 +213,8 @@ impl Template for MainView {
ToggleButton::new() ToggleButton::new()
.class("single_content") .class("single_content")
.text("ToggleButton") .text("ToggleButton")
.margin((0.0, 8.0, 0.0, 0.0)) .margin((0., 8., 2., 0.))
.icon(material_icons_font_ttf::MD_ALARM_ON)
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(3)) .attach(Grid::row(3))
.build(ctx), .build(ctx),
@@ -224,21 +222,21 @@ impl Template for MainView {
.child( .child(
CheckBox::new() CheckBox::new()
.text("CheckBox") .text("CheckBox")
.margin((0.0, 8.0, 0.0, 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.0, 8.0, 0.0, 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( .child(
TextBlock::new() TextBlock::new()
.margin((0.0, 8.0, 0.0, 0.0)) .margin((0., 8., 0., 0.))
.element("h1") .element("h1")
.id("value_text") .id("value_text")
.text("0") .text("0")
@@ -262,7 +260,7 @@ impl Template for MainView {
TextBlock::new() TextBlock::new()
.class("body") .class("body")
.text(("result", id)) .text(("result", id))
.margin((0.0, 8.0, 0.0, 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),
@@ -271,7 +269,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.0, 8.0, 0.0, 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| {
@@ -286,7 +284,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.0, 8.0, 0.0, 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| {
@@ -299,8 +297,10 @@ impl Template for MainView {
) )
.child( .child(
Button::new() Button::new()
.margin((0.0, 8.0, 0.0, 0.0)) .margin((0., 8., 0., 0.))
.class("single_content") .class("single_content")
.margin((0., 8., 8., 0.))
.icon(material_icons_font_ttf::MD_CLEAR)
.text("clear text") .text("clear text")
.on_click(move |states, _| { .on_click(move |states, _| {
state(id, states).action(Action::ClearText); state(id, states).action(Action::ClearText);
@@ -310,8 +310,8 @@ impl Template for MainView {
) )
.child( .child(
NumericBox::new() NumericBox::new()
.margin((0.0, 8.0, 0.0, 0.0)) .margin((-0., 8., 0., 0.))
.max(123.0) .max(123.)
.step(0.123) .step(0.123)
.val(0.123) .val(0.123)
.build(ctx), .build(ctx),
@@ -323,14 +323,14 @@ impl Template for MainView {
.rows( .rows(
Rows::new() Rows::new()
.add("auto") .add("auto")
.add(32.0) .add(32.)
.add(16.0) .add(16.)
.add(204.0) .add(204.)
.add("auto") .add("auto")
.add(192.0) .add(192.)
.add("auto"), .add("auto"),
) )
.columns(Columns::new().add("*").add(4.0).add("*")) .columns(Columns::new().add("*").add(4.).add("*"))
.attach(Grid::column(4)) .attach(Grid::column(4))
.child( .child(
TextBlock::new() TextBlock::new()
@@ -350,7 +350,7 @@ 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.0, 0.0, 2.0)) .margin((0., 0., 0., 2.))
.v_align("center") .v_align("center")
.text(text) .text(text)
.build(bc) .build(bc)
@@ -359,7 +359,7 @@ 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.0, 8.0, 0.0, 0.0)) .margin((0., 8., 0., 0.))
.count(("combo_box_list_count", id)) .count(("combo_box_list_count", id))
.build(ctx), .build(ctx),
) )
@@ -367,18 +367,18 @@ impl Template for MainView {
ItemsWidget::new() ItemsWidget::new()
.element("items-widget") .element("items-widget")
.id("items") .id("items")
.padding((4.0, 4.0, 4.0, 2.0)) .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.0, 0.0, 8.0)) .margin((0., 0., 0., 8.))
.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.0, 0.0, 2.0)) .margin((0., 0., 0., 2.))
.text(text) .text(text)
.build(bc) .build(bc)
}) })
@@ -390,12 +390,12 @@ impl Template for MainView {
.element("button") .element("button")
.class("single_content") .class("single_content")
.id("remove-item-button") .id("remove-item-button")
.icon(material_font_icons::MINUS_FONT_ICON) .icon(material_icons_font_ttf::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.0) .min_width(0.)
.attach(Grid::column(0)) .attach(Grid::column(0))
.attach(Grid::row(4)) .attach(Grid::row(4))
.build(ctx), .build(ctx),
@@ -405,12 +405,12 @@ impl Template for MainView {
.element("button") .element("button")
.class("single_content") .class("single_content")
.id("add-item-button") .id("add-item-button")
.icon(material_font_icons::ADD_FONT_ICON) .icon(material_icons_font_ttf::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.0) .min_width(0.)
.attach(Grid::column(2)) .attach(Grid::column(2))
.attach(Grid::row(4)) .attach(Grid::row(4))
.build(ctx), .build(ctx),
@@ -421,14 +421,14 @@ 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.0, 16.0, 0.0, 8.0)) .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.0, 0.0, 2.0)) .margin((0., 0., 0., 2.))
.v_align("center") .v_align("center")
.text(text) .text(text)
.build(bc) .build(bc)
@@ -441,7 +441,7 @@ impl Template for MainView {
TextBlock::new() TextBlock::new()
.element("text-block") .element("text-block")
.id("selection") .id("selection")
.max_width(120.0) .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))
@@ -463,8 +463,8 @@ fn main() {
.window(|ctx| { .window(|ctx| {
Window::new() Window::new()
.title("OrbTk - widgets example") .title("OrbTk - widgets example")
.position((100.0, 100.0)) .position((100., 100.))
.size(468.0, 730.0) .size(468., 730.)
.resizeable(true) .resizeable(true)
.child(MainView::new().build(ctx)) .child(MainView::new().build(ctx))
.build(ctx) .build(ctx)