a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-29 17:34:58 +03:00
Code Issues Projects Releases Wiki Activity

rename ButtonStyle to ButtonTheme to avoid ambiguity

Browse Source 
widgetry::styles::button:ButtonStyle -> ButtonTheme is a collection of
colors

vs. widgetry::widgets::button::ButtonStyle which is a per-state styling
(hover vs. disabled etc.)
This commit is contained in:
Michael Kirk 2021-02-22 12:10:14 -08:00
parent 2ed55f40a1
commit cfaf441b89
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widgetry/src/style/buttons.rs
View File

@ -1,6 +1,6 @@
use geom::CornerRadii; use geom::CornerRadii;
use super::ButtonStyle; use super::ButtonTheme;
use crate::{ use crate::{
include_labeled_bytes, ButtonBuilder, ControlState, EventCtx, Key, ScreenDims, Style, Widget, include_labeled_bytes, ButtonBuilder, ControlState, EventCtx, Key, ScreenDims, Style, Widget,
}; };
@ -238,7 +238,7 @@ impl<'a> StyledButtons<'a> for Style {
} }
impl<'a> Style { impl<'a> Style {
pub fn btn_plain(&self, button_style: &ButtonStyle) -> ButtonBuilder<'a> { pub fn btn_plain(&self, button_style: &ButtonTheme) -> ButtonBuilder<'a> {
ButtonBuilder::new() ButtonBuilder::new()
.label_color(button_style.fg, ControlState::Default) .label_color(button_style.fg, ControlState::Default)
.label_color(button_style.fg_disabled, ControlState::Disabled) .label_color(button_style.fg_disabled, ControlState::Disabled)
@ -249,7 +249,7 @@ impl<'a> Style {
.bg_color(button_style.bg_disabled, ControlState::Disabled) .bg_color(button_style.bg_disabled, ControlState::Disabled)
} }
pub fn btn_solid(&self, button_style: &ButtonStyle) -> ButtonBuilder<'a> { pub fn btn_solid(&self, button_style: &ButtonTheme) -> ButtonBuilder<'a> {
self.btn_plain(button_style).outline( self.btn_plain(button_style).outline(
self.outline_thickness, self.outline_thickness,
button_style.outline, button_style.outline,
@ -257,7 +257,7 @@ impl<'a> Style {
) )
} }
pub fn btn_outline(&self, button_style: &ButtonStyle) -> ButtonBuilder<'a> { pub fn btn_outline(&self, button_style: &ButtonTheme) -> ButtonBuilder<'a> {
self.btn_plain(button_style).outline( self.btn_plain(button_style).outline(
self.outline_thickness, self.outline_thickness,
button_style.outline, button_style.outline,

26
widgetry/src/style/mod.rs
View File

@ -9,16 +9,16 @@ pub struct Style {
pub panel_bg: Color, pub panel_bg: Color,
pub hotkey_color: Color, pub hotkey_color: Color,
pub loading_tips: Text, pub loading_tips: Text,
pub btn_solid_dark: ButtonStyle, pub btn_solid_dark: ButtonTheme,
pub btn_outline_dark: ButtonStyle, pub btn_outline_dark: ButtonTheme,
pub btn_solid_light: ButtonStyle, pub btn_solid_light: ButtonTheme,
pub btn_outline_light: ButtonStyle, pub btn_outline_light: ButtonTheme,
pub btn_solid_destructive: ButtonStyle, pub btn_solid_destructive: ButtonTheme,
pub btn_outline_destructive: ButtonStyle, pub btn_outline_destructive: ButtonTheme,
} }
#[derive(Clone)] #[derive(Clone)]
pub struct ButtonStyle { pub struct ButtonTheme {
pub fg: Color, pub fg: Color,
pub fg_disabled: Color, pub fg_disabled: Color,
pub outline: Color, pub outline: Color,
@ -37,7 +37,7 @@ impl Style {
loading_tips: Text::new(), loading_tips: Text::new(),
// Buttons // Buttons
btn_solid_dark: ButtonStyle { btn_solid_dark: ButtonTheme {
fg: hex("#4C4C4C"), fg: hex("#4C4C4C"),
fg_disabled: hex("#4C4C4C").alpha(0.3), fg_disabled: hex("#4C4C4C").alpha(0.3),
bg: Color::WHITE.alpha(0.8), bg: Color::WHITE.alpha(0.8),
@ -45,7 +45,7 @@ impl Style {
bg_disabled: Color::grey(0.6), bg_disabled: Color::grey(0.6),
outline: Color::WHITE.alpha(0.6), outline: Color::WHITE.alpha(0.6),
}, },
btn_outline_dark: ButtonStyle { btn_outline_dark: ButtonTheme {
fg: hex("#4C4C4C"), fg: hex("#4C4C4C"),
fg_disabled: hex("#4C4C4C").alpha(0.3), fg_disabled: hex("#4C4C4C").alpha(0.3),
bg: Color::CLEAR, bg: Color::CLEAR,
@ -53,7 +53,7 @@ impl Style {
bg_disabled: Color::grey(0.8), bg_disabled: Color::grey(0.8),
outline: hex("#4C4C4C"), outline: hex("#4C4C4C"),
}, },
btn_solid_light: ButtonStyle { btn_solid_light: ButtonTheme {
fg: hex("#F2F2F2"), fg: hex("#F2F2F2"),
fg_disabled: hex("#F2F2F2").alpha(0.3), fg_disabled: hex("#F2F2F2").alpha(0.3),
bg: hex("#003046").alpha(0.8), bg: hex("#003046").alpha(0.8),
@ -61,7 +61,7 @@ impl Style {
bg_disabled: Color::grey(0.1), bg_disabled: Color::grey(0.1),
outline: hex("#003046").alpha(0.6), outline: hex("#003046").alpha(0.6),
}, },
btn_outline_light: ButtonStyle { btn_outline_light: ButtonTheme {
fg: hex("#F2F2F2"), fg: hex("#F2F2F2"),
fg_disabled: hex("#F2F2F2").alpha(0.3), fg_disabled: hex("#F2F2F2").alpha(0.3),
bg: Color::CLEAR, bg: Color::CLEAR,
@ -69,7 +69,7 @@ impl Style {
bg_disabled: Color::grey(0.5), bg_disabled: Color::grey(0.5),
outline: hex("#F2F2F2"), outline: hex("#F2F2F2"),
}, },
btn_solid_destructive: ButtonStyle { btn_solid_destructive: ButtonTheme {
fg: hex("#F2F2F2"), fg: hex("#F2F2F2"),
fg_disabled: hex("#F2F2F2").alpha(0.3), fg_disabled: hex("#F2F2F2").alpha(0.3),
bg: hex("#FF5E5E").alpha(0.8), bg: hex("#FF5E5E").alpha(0.8),
@ -77,7 +77,7 @@ impl Style {
bg_disabled: Color::grey(0.1), bg_disabled: Color::grey(0.1),
outline: hex("#FF5E5E").alpha(0.6), outline: hex("#FF5E5E").alpha(0.6),
}, },
btn_outline_destructive: ButtonStyle { btn_outline_destructive: ButtonTheme {
fg: hex("#FF5E5E"), fg: hex("#FF5E5E"),
fg_disabled: hex("#FF5E5E").alpha(0.3), fg_disabled: hex("#FF5E5E").alpha(0.3),
bg: Color::CLEAR, bg: Color::CLEAR,