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

more contrast in hotkey color

Browse Source
This commit is contained in:
Michael Kirk 2021-01-24 10:42:57 -06:00 committed by Dustin Carlino
parent 4ad7f6bebd
commit 8211329c6f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ impl<'a> Style {
fn btn_hotkey(&self, button_style: &ButtonStyle, label: &str, key: Key) -> ButtonBuilder<'a> {
let default = {
let mut txt = Text::new();
let key_txt = Line(key.describe()).fg(self.hotkey_color);
let key_txt = Line(key.describe()).fg(button_style.fg_hotkey);
txt.append(key_txt);
let label_text = Line(format!(" - {}", label)).fg(button_style.fg);
txt.append(label_text);
@ -287,7 +287,7 @@ impl<'a> Style {
let disabled = {
let mut txt = Text::new();
let key_txt = Line(key.describe()).fg(self.hotkey_color.alpha(0.3));
let key_txt = Line(key.describe()).fg(button_style.fg_hotkey.alpha(0.3));
txt.append(key_txt);
let label_text = Line(format!(" - {}", label)).fg(button_style.fg_disabled);
txt.append(label_text);

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

@ -22,6 +22,7 @@ pub struct Style {
pub struct ButtonStyle {
pub fg: Color,
pub fg_disabled: Color,
pub fg_hotkey: Color,
pub outline: Color,
pub bg: Color,
pub bg_hover: Color,
@ -42,6 +43,7 @@ impl Style {
btn_solid_dark: ButtonStyle {
fg: hex("#4C4C4C"),
fg_disabled: hex("#4C4C4C").alpha(0.3),
fg_hotkey: hex("#EE702E"),
bg: Color::WHITE.alpha(0.8),
bg_hover: Color::WHITE,
bg_disabled: Color::grey(0.6),
@ -50,6 +52,7 @@ impl Style {
btn_outline_dark: ButtonStyle {
fg: hex("#4C4C4C"),
fg_disabled: hex("#4C4C4C").alpha(0.3),
fg_hotkey: hex("#EE702E"),
bg: Color::CLEAR,
bg_hover: hex("#4C4C4C").alpha(0.1),
bg_disabled: Color::grey(0.8),
@ -58,6 +61,7 @@ impl Style {
btn_solid_light: ButtonStyle {
fg: hex("#F2F2F2"),
fg_disabled: hex("#F2F2F2").alpha(0.3),
fg_hotkey: Color::GREEN,
bg: hex("#003046").alpha(0.8),
bg_hover: hex("#003046"),
bg_disabled: Color::grey(0.1),
@ -66,6 +70,7 @@ impl Style {
btn_outline_light: ButtonStyle {
fg: hex("#F2F2F2"),
fg_disabled: hex("#F2F2F2").alpha(0.3),
fg_hotkey: Color::GREEN,
bg: Color::CLEAR,
bg_hover: hex("#F2F2F2").alpha(0.1),
bg_disabled: Color::grey(0.5),
@ -74,6 +79,7 @@ impl Style {
btn_solid_destructive: ButtonStyle {
fg: hex("#F2F2F2"),
fg_disabled: hex("#F2F2F2").alpha(0.3),
fg_hotkey: Color::GREEN,
bg: hex("#FF5E5E").alpha(0.8),
bg_hover: hex("#FF5E5E"),
bg_disabled: Color::grey(0.1),
@ -82,6 +88,7 @@ impl Style {
btn_outline_destructive: ButtonStyle {
fg: hex("#FF5E5E"),
fg_disabled: hex("#FF5E5E").alpha(0.3),
fg_hotkey: Color::GREEN,
bg: Color::CLEAR,
bg_hover: hex("#FF5E5E").alpha(0.1),
bg_disabled: Color::grey(0.1),