pleshevskiy
/
hwt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style(win): some cosmetic changes

This commit is contained in:
Dmitriy Pleshevskiy 2022-02-12 23:19:56 +03:00
parent f5db0d9543
commit f330ea2865
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/win/rest.rs
View File

@ -2,7 +2,7 @@ use crate::cmd;
use crate::comp;
use crate::env;
use crate::state;
use druid::widget::Flex;
use druid::widget::{Flex, MainAxisAlignment};
use druid::{MenuDesc, Target, Widget, WidgetExt, WidgetId, WindowDesc};
pub fn create(parent_widget_id: WidgetId, rest_duration_secs: f64) -> WindowDesc<state::App> {
@ -23,6 +23,7 @@ pub fn create(parent_widget_id: WidgetId, rest_duration_secs: f64) -> WindowDesc
fn build(parent_widget_id: WidgetId, rest_duration_secs: f64) -> impl Widget<state::App> {
Flex::column()
.main_axis_alignment(MainAxisAlignment::Center)
.with_child(
build_idle_timer(parent_widget_id, rest_duration_secs).lens(state::App::notifier),
)

35
src/win/status.rs
View File

@ -18,6 +18,14 @@ pub fn create() -> WindowDesc<state::App> {
fn build() -> impl Widget<state::App> {
Flex::column()
.cross_axis_alignment(CrossAxisAlignment::Start)
.with_child(build_timers())
.with_default_spacer()
.with_child(build_pause_btn())
.padding((8.0, 8.0))
}
fn build_timers() -> impl Widget<state::App> {
Flex::column()
.with_child(
comp::break_timer::build(
"Micro",
@ -37,17 +45,18 @@ fn build() -> impl Widget<state::App> {
)
.lens(state::App::rest_break),
)
.with_default_spacer()
.with_child(Either::new(
|data: &state::App, _env| data.paused,
Button::new("Unpause").on_click(|ctx, data: &mut state::App, _env| {
data.paused = false;
ctx.submit_command(cmd::UNPAUSE_ALL_TIMER_COMP.with(false))
}),
Button::new("Pause").on_click(|ctx, data: &mut state::App, _env| {
data.paused = true;
ctx.submit_command(cmd::PAUSE_ALL_TIMER_COMP)
}),
))
.padding((8.0, 8.0))
}
fn build_pause_btn() -> impl Widget<state::App> {
Either::new(
|data: &state::App, _env| data.paused,
Button::new("Unpause").on_click(|ctx, data: &mut state::App, _env| {
data.paused = false;
ctx.submit_command(cmd::UNPAUSE_ALL_TIMER_COMP.with(false))
}),
Button::new("Pause").on_click(|ctx, data: &mut state::App, _env| {
data.paused = true;
ctx.submit_command(cmd::PAUSE_ALL_TIMER_COMP)
}),
)
}