dan/cushy
1
0
Fork 0
mirror of https://github.com/danbulant/cushy synced 2026-07-06 19:50:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Centering checkbox ornament

Browse source
This commit is contained in:
Jonathan Johnson 2023-11-22 10:55:33 -08:00
parent c9566fe1bd
commit 00cb29d261
No known key found for this signature in database
GPG key ID: A66D6A34D6620579
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/widgets/checkbox.rs
View file

@ -3,7 +3,7 @@ use std::error::Error;
use std::fmt::Display; use std::fmt::Display;
use std::ops::Not; use std::ops::Not;
use kludgine::figures::units::Lp; use kludgine::figures::units::{Lp, Px};
use kludgine::figures::{Point, Rect, ScreenScale, Size}; use kludgine::figures::{Point, Rect, ScreenScale, Size};
use kludgine::shapes::{PathBuilder, Shape, StrokeOptions}; use kludgine::shapes::{PathBuilder, Shape, StrokeOptions};
@ -52,7 +52,7 @@ impl Checkbox {
impl MakeWidget for Checkbox { impl MakeWidget for Checkbox {
fn make_widget(self) -> WidgetInstance { fn make_widget(self) -> WidgetInstance {
CheckboxLabel { CheckboxOrnament {
value: self.state.create_reader(), value: self.state.create_reader(),
} }
.and(self.label) .and(self.label)
@ -169,11 +169,11 @@ impl Display for CheckboxToBoolError {
impl Error for CheckboxToBoolError {} impl Error for CheckboxToBoolError {}
#[derive(Debug)] #[derive(Debug)]
struct CheckboxLabel { struct CheckboxOrnament {
value: DynamicReader<CheckboxState>, value: DynamicReader<CheckboxState>,
} }
impl Widget for CheckboxLabel { impl Widget for CheckboxOrnament {
fn redraw(&mut self, context: &mut GraphicsContext<'_, '_, '_, '_, '_>) { fn redraw(&mut self, context: &mut GraphicsContext<'_, '_, '_, '_, '_>) {
let checkbox_size = context let checkbox_size = context
.gfx .gfx
@ -182,7 +182,14 @@ impl Widget for CheckboxLabel {
.width .width
.min(context.gfx.region().size.height); .min(context.gfx.region().size.height);
let checkbox_rect = Rect::from(Size::squared(checkbox_size)); let checkbox_rect = Rect::new(
Point::new(
Px::ZERO,
(context.gfx.region().size.height - checkbox_size) / 2,
),
Size::squared(checkbox_size),
);
let stroke_options = StrokeOptions::lp_wide(Lp::points(2)).into_px(context.gfx.scale()); let stroke_options = StrokeOptions::lp_wide(Lp::points(2)).into_px(context.gfx.scale());
match self.value.get_tracking_refresh(context) { match self.value.get_tracking_refresh(context) {
state @ (CheckboxState::Checked | CheckboxState::Indeterminant) => { state @ (CheckboxState::Checked | CheckboxState::Indeterminant) => {