tychovrahe
5 months ago
parent
6b31b8eec3
commit
6e6638773b
@ -0,0 +1 @@
|
||||
[T2T1] Added user adjustable brightness setting.
|
||||
@ -0,0 +1,41 @@
|
||||
#[cfg(not(feature = "bootloader"))]
|
||||
use crate::storage;
|
||||
|
||||
// Typical backlight values.
|
||||
|
||||
#[cfg(feature = "bootloader")]
|
||||
pub fn get_backlight_normal() -> u16 {
|
||||
150
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "bootloader"))]
|
||||
pub fn get_backlight_normal() -> u16 {
|
||||
storage::get_brightness().unwrap_or(150).into()
|
||||
}
|
||||
|
||||
#[cfg(feature = "bootloader")]
|
||||
pub fn get_backlight_low() -> u16 {
|
||||
150
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "bootloader"))]
|
||||
pub fn get_backlight_low() -> u16 {
|
||||
let val = storage::get_brightness();
|
||||
return if val.is_ok() && val.unwrap() < 45 {
|
||||
val.unwrap().into()
|
||||
} else {
|
||||
45
|
||||
};
|
||||
}
|
||||
|
||||
pub fn get_backlight_dim() -> u16 {
|
||||
5
|
||||
}
|
||||
|
||||
pub fn get_backlight_none() -> u16 {
|
||||
2
|
||||
}
|
||||
|
||||
pub fn get_backlight_max() -> u16 {
|
||||
255
|
||||
}
|
||||
@ -0,0 +1,202 @@
|
||||
use crate::ui::{
|
||||
component::{base::ComponentExt, Child, Component, Event, EventCtx},
|
||||
constant::screen,
|
||||
display,
|
||||
event::TouchEvent,
|
||||
geometry::{Grid, Insets, Point, Rect},
|
||||
};
|
||||
|
||||
use super::{theme, Button, ButtonMsg};
|
||||
|
||||
pub enum NumberInputSliderDialogMsg {
|
||||
Confirmed,
|
||||
Cancelled,
|
||||
}
|
||||
|
||||
pub struct NumberInputSliderDialog<F>
|
||||
where
|
||||
F: Fn(u32),
|
||||
{
|
||||
area: Rect,
|
||||
callback: F,
|
||||
input: Child<NumberInputSlider>,
|
||||
cancel_button: Child<Button>,
|
||||
confirm_button: Child<Button>,
|
||||
}
|
||||
|
||||
impl<F> NumberInputSliderDialog<F>
|
||||
where
|
||||
F: Fn(u32),
|
||||
{
|
||||
pub fn new(min: u32, max: u32, init_value: u32, callback: F) -> Self {
|
||||
Self {
|
||||
area: Rect::zero(),
|
||||
callback,
|
||||
input: NumberInputSlider::new(min, max, init_value).into_child(),
|
||||
cancel_button: Button::with_text("CANCEL".into())
|
||||
.styled(theme::button_cancel())
|
||||
.into_child(),
|
||||
confirm_button: Button::with_text("CONFIRM".into())
|
||||
.styled(theme::button_confirm())
|
||||
.into_child(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn value(&self) -> u32 {
|
||||
self.input.inner().value
|
||||
}
|
||||
}
|
||||
|
||||
impl<F> Component for NumberInputSliderDialog<F>
|
||||
where
|
||||
F: Fn(u32),
|
||||
{
|
||||
type Msg = NumberInputSliderDialogMsg;
|
||||
|
||||
fn place(&mut self, bounds: Rect) -> Rect {
|
||||
self.area = bounds;
|
||||
let button_height = theme::BUTTON_HEIGHT;
|
||||
let content_area = self.area.inset(Insets::top(2 * theme::BUTTON_SPACING));
|
||||
let (_, content_area) = content_area.split_top(30);
|
||||
let (input_area, _) = content_area.split_top(15);
|
||||
let (_, button_area) = content_area.split_bottom(button_height);
|
||||
// let (content_area, button_area) = content_area.split_bottom(button_height);
|
||||
// let content_area = content_area.inset(Insets::new(
|
||||
// theme::BUTTON_SPACING,
|
||||
// 0,
|
||||
// theme::BUTTON_SPACING,
|
||||
// theme::CONTENT_BORDER,
|
||||
// ));
|
||||
|
||||
let grid = Grid::new(button_area, 1, 2).with_spacing(theme::KEYBOARD_SPACING);
|
||||
self.input.place(input_area.inset(Insets::sides(20)));
|
||||
self.cancel_button.place(grid.row_col(0, 0));
|
||||
self.confirm_button.place(grid.row_col(0, 1));
|
||||
bounds
|
||||
}
|
||||
|
||||
fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
|
||||
if let Some(NumberInputSliderMsg::Changed(i)) = self.input.event(ctx, event) {
|
||||
(self.callback)(i);
|
||||
}
|
||||
if let Some(ButtonMsg::Clicked) = self.cancel_button.event(ctx, event) {
|
||||
return Some(Self::Msg::Cancelled);
|
||||
}
|
||||
if let Some(ButtonMsg::Clicked) = self.confirm_button.event(ctx, event) {
|
||||
return Some(Self::Msg::Confirmed);
|
||||
};
|
||||
None
|
||||
}
|
||||
|
||||
fn paint(&mut self) {
|
||||
self.input.paint();
|
||||
// self.paragraphs_pad.paint();
|
||||
// self.paragraphs.paint();
|
||||
self.cancel_button.paint();
|
||||
self.confirm_button.paint();
|
||||
}
|
||||
|
||||
#[cfg(feature = "ui_bounds")]
|
||||
fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
|
||||
sink(self.area);
|
||||
self.input.bounds(sink);
|
||||
// self.paragraphs.bounds(sink);
|
||||
self.cancel_button.bounds(sink);
|
||||
self.confirm_button.bounds(sink);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "ui_debug")]
|
||||
impl<F> crate::trace::Trace for NumberInputSliderDialog<F>
|
||||
where
|
||||
F: Fn(u32),
|
||||
{
|
||||
fn trace(&self, t: &mut dyn crate::trace::Tracer) {
|
||||
t.component("NumberInputSliderDialog");
|
||||
t.child("input", &self.input);
|
||||
t.child("cancel_button", &self.cancel_button);
|
||||
t.child("confirm_button", &self.confirm_button);
|
||||
}
|
||||
}
|
||||
|
||||
pub enum NumberInputSliderMsg {
|
||||
Changed(u32),
|
||||
}
|
||||
|
||||
pub struct NumberInputSlider {
|
||||
area: Rect,
|
||||
touch_area: Rect,
|
||||
min: u32,
|
||||
max: u32,
|
||||
value: u32,
|
||||
}
|
||||
|
||||
impl NumberInputSlider {
|
||||
pub fn new(min: u32, max: u32, value: u32) -> Self {
|
||||
let value = value.clamp(min, max);
|
||||
Self {
|
||||
area: Rect::zero(),
|
||||
touch_area: Rect::zero(),
|
||||
min,
|
||||
max,
|
||||
value,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn slider_eval(&mut self, pos: Point, ctx: &mut EventCtx) -> Option<NumberInputSliderMsg> {
|
||||
if self.touch_area.contains(pos) {
|
||||
let filled = pos.x - self.area.x0;
|
||||
let filled = filled.clamp(0, self.area.width());
|
||||
let val_pct = (filled as u32 * 100) / self.area.width() as u32;
|
||||
let val = (val_pct * (self.max - self.min)) / 100 + self.min;
|
||||
|
||||
if val != self.value {
|
||||
self.value = val;
|
||||
ctx.request_paint();
|
||||
return Some(NumberInputSliderMsg::Changed(self.value));
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
impl Component for NumberInputSlider {
|
||||
type Msg = NumberInputSliderMsg;
|
||||
|
||||
fn place(&mut self, bounds: Rect) -> Rect {
|
||||
self.area = bounds;
|
||||
self.touch_area = bounds.outset(Insets::new(40, 20, 40, 20)).clamp(screen());
|
||||
bounds
|
||||
}
|
||||
|
||||
fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
|
||||
if let Event::Touch(touch_event) = event {
|
||||
return match touch_event {
|
||||
TouchEvent::TouchStart(pos) => self.slider_eval(pos, ctx),
|
||||
TouchEvent::TouchMove(pos) => self.slider_eval(pos, ctx),
|
||||
TouchEvent::TouchEnd(pos) => self.slider_eval(pos, ctx),
|
||||
};
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn paint(&mut self) {
|
||||
let val_pct = (100 * (self.value - self.min)) / (self.max - self.min);
|
||||
let fill_to = (val_pct as i16 * self.area.width()) / 100;
|
||||
|
||||
display::bar_with_text_and_fill(self.area, None, theme::FG, theme::BG, 0, fill_to as _);
|
||||
}
|
||||
|
||||
#[cfg(feature = "ui_bounds")]
|
||||
fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
|
||||
sink(self.area)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "ui_debug")]
|
||||
impl crate::trace::Trace for NumberInputSlider {
|
||||
fn trace(&self, t: &mut dyn crate::trace::Tracer) {
|
||||
t.component("NumberInput");
|
||||
t.int("value", self.value as i64);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
#[cfg(not(feature = "bootloader"))]
|
||||
use crate::storage;
|
||||
|
||||
// Typical backlight values.
|
||||
|
||||
#[cfg(feature = "bootloader")]
|
||||
pub fn get_backlight_normal() -> u16 {
|
||||
150
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "bootloader"))]
|
||||
pub fn get_backlight_normal() -> u16 {
|
||||
storage::get_brightness().unwrap_or(150).into()
|
||||
}
|
||||
|
||||
pub fn get_backlight_low() -> u16 {
|
||||
45
|
||||
}
|
||||
|
||||
pub fn get_backlight_dim() -> u16 {
|
||||
5
|
||||
}
|
||||
|
||||
pub fn get_backlight_none() -> u16 {
|
||||
2
|
||||
}
|
||||
|
||||
pub fn get_backlight_max() -> u16 {
|
||||
255
|
||||
}
|
||||
@ -1,8 +1,41 @@
|
||||
from micropython import const
|
||||
|
||||
import storage.device
|
||||
|
||||
# backlight brightness
|
||||
BACKLIGHT_NORMAL = const(150)
|
||||
BACKLIGHT_LOW = const(45)
|
||||
BACKLIGHT_DIM = const(5)
|
||||
BACKLIGHT_NONE = const(0)
|
||||
BACKLIGHT_MAX = const(255)
|
||||
_BACKLIGHT_NORMAL = const(150)
|
||||
_BACKLIGHT_LOW = const(45)
|
||||
_BACKLIGHT_DIM = const(5)
|
||||
_BACKLIGHT_NONE = const(0)
|
||||
_BACKLIGHT_MIN = const(10)
|
||||
_BACKLIGHT_MAX = const(255)
|
||||
|
||||
|
||||
def get_backlight_normal() -> int:
|
||||
val = storage.device.get_brightness()
|
||||
if val is None:
|
||||
return _BACKLIGHT_NORMAL
|
||||
return val
|
||||
|
||||
|
||||
def get_backlight_low() -> int:
|
||||
val = storage.device.get_brightness()
|
||||
if val is None or val > _BACKLIGHT_LOW:
|
||||
return _BACKLIGHT_LOW
|
||||
return val
|
||||
|
||||
|
||||
def get_backlight_dim() -> int:
|
||||
return _BACKLIGHT_DIM
|
||||
|
||||
|
||||
def get_backlight_none() -> int:
|
||||
return _BACKLIGHT_NONE
|
||||
|
||||
|
||||
def get_backlight_min() -> int:
|
||||
return _BACKLIGHT_MIN
|
||||
|
||||
|
||||
def get_backlight_max() -> int:
|
||||
return _BACKLIGHT_MAX
|
||||
|
||||
@ -0,0 +1 @@
|
||||
Added user adjustable brightness setting.
|
||||
Loading…
Reference in new issue