linter updates

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
2021-11-12 15:48:17 +01:00
parent c1a4547261
commit c8f6a6d272
36 changed files with 1005 additions and 614 deletions

View File

@@ -7,10 +7,7 @@
use orbtk::prelude::*;
use crate::{
receiver::receiver_view::ReceiverView,
sender::sender_view::SenderView,
};
use crate::{receiver::receiver_view::ReceiverView, sender::sender_view::SenderView};
// constants
pub static ID_SENDER_VIEW: &str = "sender_view";
@@ -23,20 +20,18 @@ widget!(MainView {
impl Template for MainView {
fn template(self, _id: Entity, ctx: &mut BuildContext<'_>) -> Self {
let receiver_view = ReceiverView::new()
.build(ctx);
let receiver_view = ReceiverView::new().build(ctx);
let sender_view = SenderView::new()
.target(receiver_view.0) // entity of the target
.build(ctx);
self.name("MainView")
.child(
self.name("MainView").child(
Stack::new()
.orientation("vertical")
.child(sender_view)
.child(receiver_view)
.build(ctx)
.build(ctx),
)
// .child(
// TabWidget::new()

View File

@@ -13,7 +13,7 @@ use crate::sender::sender_state::{SenderAction, SenderState};
/// state changes for the `SenderView` widget.
pub enum TestMessageAction {
// Toggle visibility of a message TextBox.
ToggleMessageBox
ToggleMessageBox,
}
/// Valid `structure members` of the `ReceiverState` used to react on
@@ -21,7 +21,7 @@ pub enum TestMessageAction {
#[derive(Default, AsAny)]
pub struct ReceiverState {
message_box: Option<Entity>,
progress_bar: Entity
progress_bar: Entity,
}
/// Method definitions, we provide inside the `ReceiverState`.
@@ -38,7 +38,8 @@ impl ReceiverState {
impl State for ReceiverState {
// initialize the view entities
fn init(&mut self, _: &mut Registry, ctx: &mut Context) {
self.progress_bar = ctx.entity_of_child("progress_bar")
self.progress_bar = ctx
.entity_of_child("progress_bar")
.expect("Cannot find ProgressBar!");
}
@@ -47,7 +48,7 @@ impl State for ReceiverState {
&mut self,
mut messages: MessageReader,
_registry: &mut Registry,
ctx: &mut Context
ctx: &mut Context,
) {
for message in messages.read::<SenderAction>() {
match message {

View File

@@ -7,31 +7,26 @@
use orbtk::prelude::*;
use crate::receiver::receiver_state::{TestMessageAction, ReceiverState};
use crate::receiver::receiver_state::{ReceiverState, TestMessageAction};
widget!(ReceiverView<ReceiverState>);
impl Template for ReceiverView {
fn template(self, _id: Entity, bc: &mut BuildContext) -> Self {
self.name("ReceiverView")
.child(
self.name("ReceiverView").child(
Stack::new()
.orientation("vertical")
.spacing(16)
.child(
ProgressBar::new()
.id("progress_bar")
.build(bc)
)
.child(ProgressBar::new().id("progress_bar").build(bc))
.child(
TextBox::new()
.id("message_box")
.h_align("center")
.text("message received. Box toggled!")
.visibility("hidden")
.build(bc)
.build(bc),
)
.build(bc)
.build(bc),
)
}
}

View File

@@ -21,7 +21,7 @@ pub struct SenderState {
// actions
actions: Vec<SenderAction>,
// entity that will receive the message
target: Entity
target: Entity,
}
/// Method definitions, we provide inside the `SenderState`.
@@ -38,8 +38,11 @@ impl State for SenderState {
// initialize the view entities
fn init(&mut self, _registry: &mut Registry, ctx: &mut Context) {
// create the target entity, that receives the Sender messages
self.target = Entity::from(ctx.widget().try_clone::<u32>("target")
.expect("ERROR: SenderState::init(): target entity not found!"));
self.target = Entity::from(
ctx.widget()
.try_clone::<u32>("target")
.expect("ERROR: SenderState::init(): target entity not found!"),
);
}
// update entities, before we render the view

View File

@@ -16,8 +16,7 @@ widget!(SenderView<SenderState> {
impl Template for SenderView {
fn template(self, id: Entity, bc: &mut BuildContext) -> Self {
self.name("SenderView")
.child(
self.name("SenderView").child(
Button::new()
.text("Click me to send a message!")
.v_align("center")
@@ -28,7 +27,7 @@ impl Template for SenderView {
//ctx.send_message(TestMessageAction::ToggleMessageBox, id);
false
})
.build(bc)
.build(bc),
)
}
}