diff --git a/rustdoc/game/devtools/story/fn.simplify.html b/rustdoc/game/devtools/story/fn.simplify.html index 87f706f7a9..28cabe8fed 100644 --- a/rustdoc/game/devtools/story/fn.simplify.html +++ b/rustdoc/game/devtools/story/fn.simplify.html @@ -1,4 +1,4 @@ game::devtools::story::simplify - Rust

[−][src]Function game::devtools::story::simplify

fn simplify(raw: Vec<Pt2D>) -> Ring
\ No newline at end of file + Change settings

[−][src]Function game::devtools::story::simplify

fn simplify(raw: Vec<Pt2D>) -> Ring
\ No newline at end of file diff --git a/rustdoc/game/devtools/story/index.html b/rustdoc/game/devtools/story/index.html index 2c54f7ad7f..af91197222 100644 --- a/rustdoc/game/devtools/story/index.html +++ b/rustdoc/game/devtools/story/index.html @@ -1,7 +1,7 @@ game::devtools::story - Rust

[−][src]Module game::devtools::story

Structs

+ Change settings

[−][src]Module game::devtools::story

Structs

Lasso
Marker
RecordedStoryMap
StoryMap
StoryMapEditor

Enums

Mode

Functions

make_panel
simplify
\ No newline at end of file diff --git a/rustdoc/game/devtools/story/struct.Lasso.html b/rustdoc/game/devtools/story/struct.Lasso.html index 09359d7665..86d15bc260 100644 --- a/rustdoc/game/devtools/story/struct.Lasso.html +++ b/rustdoc/game/devtools/story/struct.Lasso.html @@ -1,10 +1,10 @@ game::devtools::story::Lasso - Rust

[−][src]Struct game::devtools::story::Lasso

struct Lasso {
+                Change settings

[−][src]Struct game::devtools::story::Lasso

struct Lasso {
     pl: PolyLine,
 }

- Fields

pl: PolyLine

Implementations

impl Lasso[src]

fn new(pt: Pt2D) -> Lasso[src]

fn event(&mut self, ctx: &mut EventCtx<'_>) -> Option<Ring>[src]

fn draw(&self, g: &mut GfxCtx<'_>)[src]

Auto Trait Implementations

impl RefUnwindSafe for Lasso

impl Send for Lasso

impl Sync for Lasso

impl Unpin for Lasso

impl UnwindSafe for Lasso

Blanket Implementations

impl<T> Any for T where
    T: 'static + ?Sized, [src]

[−][src]Module game::info::person

Functions

bio
cmp_duration_shorter
crowd
current_status
header
parked_car
schedule
trips
\ No newline at end of file diff --git a/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html b/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html index 004760183e..0788bd225b 100644 --- a/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html +++ b/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html @@ -1,5 +1,5 @@ game::pregame::built_info::BUILT_TIME_UTC - Rust

[−][src]Constant game::pregame::built_info::BUILT_TIME_UTC

pub const BUILT_TIME_UTC: &str = "Sun, 24 Jan 2021 18:48:41 +0000";

The built-time in RFC2822, UTC

+ Change settings

[−][src]Constant game::pregame::built_info::BUILT_TIME_UTC

pub const BUILT_TIME_UTC: &str = "Sun, 24 Jan 2021 21:22:04 +0000";

The built-time in RFC2822, UTC

\ No newline at end of file diff --git a/rustdoc/map_gui/colors/fn.hex.html b/rustdoc/map_gui/colors/fn.hex.html index 611bcfeae9..c3bed76067 100644 --- a/rustdoc/map_gui/colors/fn.hex.html +++ b/rustdoc/map_gui/colors/fn.hex.html @@ -1,4 +1,4 @@ map_gui::colors::hex - Rust

[−][src]Function map_gui::colors::hex

fn hex(x: &str) -> Color
\ No newline at end of file + Change settings

[−][src]Function map_gui::colors::hex

fn hex(x: &str) -> Color
\ No newline at end of file diff --git a/rustdoc/map_gui/colors/fn.modulo_color.html b/rustdoc/map_gui/colors/fn.modulo_color.html index cf8b28ba69..1d2fc51c78 100644 --- a/rustdoc/map_gui/colors/fn.modulo_color.html +++ b/rustdoc/map_gui/colors/fn.modulo_color.html @@ -1,4 +1,4 @@ map_gui::colors::modulo_color - Rust

[−][src]Function map_gui::colors::modulo_color

fn modulo_color(colors: &Vec<Color>, idx: usize) -> Color
\ No newline at end of file + Change settings

[−][src]Function map_gui::colors::modulo_color

fn modulo_color(colors: &Vec<Color>, idx: usize) -> Color
\ No newline at end of file diff --git a/rustdoc/map_gui/colors/index.html b/rustdoc/map_gui/colors/index.html index aa3df69837..a40300bca5 100644 --- a/rustdoc/map_gui/colors/index.html +++ b/rustdoc/map_gui/colors/index.html @@ -1,7 +1,7 @@ map_gui::colors - Rust

[−][src]Module map_gui::colors

A color scheme groups colors used for different map, dynamic, and UI elements in one place, to + Change settings

[−][src]Module map_gui::colors

A color scheme groups colors used for different map, dynamic, and UI elements in one place, to encourage deduplication. The player can also switch between different color schemes.

Structs

ColorScheme

Enums

diff --git a/rustdoc/map_gui/colors/struct.ColorScheme.html b/rustdoc/map_gui/colors/struct.ColorScheme.html index 506acd6e9c..71c7d33cf8 100644 --- a/rustdoc/map_gui/colors/struct.ColorScheme.html +++ b/rustdoc/map_gui/colors/struct.ColorScheme.html @@ -1,9 +1,8 @@ map_gui::colors::ColorScheme - Rust -

[−][src]Struct map_gui::colors::ColorScheme

pub struct ColorScheme {
+
[−][src]Struct map_gui::colors::ColorScheme
pub struct ColorScheme {
     scheme: ColorSchemeChoice,
-    pub hovering: Color,
     pub panel_bg: Color,
     pub section_bg: Color,
     pub inner_panel: Color,
@@ -85,7 +84,7 @@
     pub before_changes: Color,
     pub after_changes: Color,
 }

-                       Fields
scheme: ColorSchemeChoicehovering: Colorpanel_bg: Colorsection_bg: Colorinner_panel: Colorday_time_slider: Colornight_time_slider: Colorselected: Colorcurrent_object: Colorperma_selected_object: Colorbottom_bar_id: Colorbottom_bar_name: Colorfade_map_dark: Colorgui_style: Styledialog_bg: Colorminimap_cursor_border: Colorminimap_cursor_bg: Option<Color>minimap_selected_zoom: Colorminimap_unselected_zoom: Colordriving_lane: Colorbus_lane: Colorparking_lane: Colorbike_lane: Colorsidewalk: Colorsidewalk_lines: Option<Color>general_road_marking: Colorroad_center_line: Colorlight_rail_track: Colorprivate_road: Colorunzoomed_highway: Colorunzoomed_arterial: Colorunzoomed_residential: Colorunzoomed_trail: Colornormal_intersection: Colorstop_sign: Colorstop_sign_pole: Colorsignal_protected_turn: Colorsignal_permitted_turn: Colorsignal_banned_turn: Colorsignal_box: Colorsignal_spinner: Colorsignal_turn_block_bg: Colorvery_slow_intersection: Colorslow_intersection: Colornormal_slow_intersection: Colorvoid_background: Colormap_background: Fillunzoomed_interesting_intersection: Colorresidential_building: Colorcommercial_building: Colorbuilding_outline: Colorparking_lot: Colorgrass: Fillwater: Fillmedian_strip: Fillpedestrian_plaza: Fillunzoomed_car: Colorunzoomed_bike: Colorunzoomed_bus: Colorunzoomed_pedestrian: Coloragent_colors: Vec<Color>route: Colorturn_arrow: Colorbrake_light: Colorbus_body: Colorbus_label: Colortrain_body: Colorped_head: Colorped_foot: Colorped_preparing_bike_body: Colorped_crowd: Colorbike_frame: Colorparked_car: Colorgood_to_bad_red: ColorScalegood_to_bad_green: ColorScalebus_layer: Coloredits_layer: Colorparking_trip: Colorbike_trip: Colorbus_trip: Colorbefore_changes: Colorafter_changes: Color
Implementations
impl ColorScheme[src]
pub fn new(ctx: &mut EventCtx<'_>, scheme: ColorSchemeChoice) -> ColorScheme[src]
fn standard() -> ColorScheme[src]
pub fn rotating_color_plot(&self, idx: usize) -> Color[src]
pub fn rotating_color_agents(&self, idx: usize) -> Color[src]
pub fn unzoomed_road_surface(&self, rank: RoadRank) -> Color[src]
pub fn zoomed_road_surface(&self, lane: LaneType, rank: RoadRank) -> Color[src]
pub fn zoomed_intersection_surface(&self, rank: RoadRank) -> Color[src]
pub fn road_center_line(&self, rank: RoadRank) -> Color[src]
pub fn general_road_marking(&self, rank: RoadRank) -> Color[src]
pub fn solid_road_center(&self) -> bool[src]
impl ColorScheme[src]
fn night_mode() -> ColorScheme[src]
fn sam_green_day() -> ColorScheme[src]
fn sam_desert_day() -> ColorScheme[src]
fn bap() -> ColorScheme[src]
fn osm() -> ColorScheme[src]
fn starcat() -> ColorScheme[src]
fn textured() -> ColorScheme[src]
fn mapbox_light() -> ColorScheme[src]
fn mapbox_dark() -> ColorScheme[src]
fn faded_zoom() -> ColorScheme[src]
fn negative_space() -> ColorScheme[src]
Auto Trait Implementations
Blanket Implementations
impl<T> Any for T where
    T: 'static + ?Sized, [src]
 use serde::{Deserialize, Serialize};
 
@@ -868,7 +865,7 @@
 
         for (idx, m) in self.story.markers.iter().enumerate() {
             if self.hovering == Some(idx) {
-                m.draw_hovered(g, app);
+                m.draw_hovered(g);
             } else {
                 g.redraw(&m.draw);
             }
@@ -1023,14 +1020,14 @@
         }
     }
 
-    fn draw_hovered(&self, g: &mut GfxCtx, app: &App) {
+    fn draw_hovered(&self, g: &mut GfxCtx) {
         let mut batch = GeomBatch::new();
         if self.pts.len() == 1 {
             batch.append(
                 GeomBatch::load_svg(g, "system/assets/timeline/goal_pos.svg")
                     .scale(2.0)
                     .centered_on(self.pts[0])
-                    .color(RewriteColor::Change(Color::hex("#5B5B5B"), app.cs.hovering)),
+                    .color(RewriteColor::Change(Color::hex("#5B5B5B"), Color::RED)),
             );
             batch.append(
                 Text::from(Line(&self.event))
@@ -1040,10 +1037,7 @@
                     .centered_on(self.pts[0]),
             );
         } else {
-            batch.push(
-                app.cs.hovering,
-                Ring::must_new(self.pts.clone()).to_polygon(),
-            );
+            batch.push(Color::RED, Ring::must_new(self.pts.clone()).to_polygon());
             // TODO Refactor plz
             batch.append(
                 Text::from(Line(&self.event))
diff --git a/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-b5501e76eef510ad/out/built.rs.html b/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-b5501e76eef510ad/out/built.rs.html
index 81198930c7..624763444d 100644
--- a/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-b5501e76eef510ad/out/built.rs.html
+++ b/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-b5501e76eef510ad/out/built.rs.html
@@ -122,7 +122,7 @@
 /// The output of `rustdoc -V`
 pub const RUSTDOC_VERSION: &str = "rustdoc 1.49.0 (e1884a8e3 2020-12-29)";
 /// The built-time in RFC2822, UTC
-pub const BUILT_TIME_UTC: &str = "Sun, 24 Jan 2021 18:48:41 +0000";
+pub const BUILT_TIME_UTC: &str = "Sun, 24 Jan 2021 21:22:04 +0000";
 /// The target architecture, given by `cfg!(target_arch)`.
 pub const CFG_TARGET_ARCH: &str = "x86_64";
 /// The endianness, given by `cfg!(target_endian)`.
diff --git a/rustdoc/src/game/info/person.rs.html b/rustdoc/src/game/info/person.rs.html
index a23c5fe06d..22a4b48957 100644
--- a/rustdoc/src/game/info/person.rs.html
+++ b/rustdoc/src/game/info/person.rs.html
@@ -676,6 +676,9 @@
 673
 674
 675
+676
+677
+678
 
 use std::collections::BTreeMap;
 
@@ -892,7 +895,10 @@
                 .btn_solid_light()
                 .custom_batch(row_btn.clone(), ControlState::Default)
                 .custom_batch(
-                    row_btn.color(RewriteColor::Change(app.cs.inner_panel, app.cs.hovering)),
+                    row_btn.color(RewriteColor::Change(
+                        app.cs.inner_panel,
+                        ctx.style().btn_outline_light.bg_hover,
+                    )),
                     ControlState::Hovered,
                 )
                 .build_widget(
diff --git a/rustdoc/src/map_gui/colors.rs.html b/rustdoc/src/map_gui/colors.rs.html
index d03c442428..661e2322a5 100644
--- a/rustdoc/src/map_gui/colors.rs.html
+++ b/rustdoc/src/map_gui/colors.rs.html
@@ -587,8 +587,6 @@
 584
 585
 586
-587
-588
 
 //! A color scheme groups colors used for different map, dynamic, and UI elements in one place, to
 //! encourage deduplication. The player can also switch between different color schemes.
@@ -649,7 +647,6 @@
     scheme: ColorSchemeChoice,
 
     // UI
-    pub hovering: Color,
     pub panel_bg: Color,
     pub section_bg: Color,
     pub inner_panel: Color,
@@ -776,7 +773,6 @@
             scheme: ColorSchemeChoice::Standard,
 
             // UI
-            hovering: gui_style.hovering_color,
             panel_bg: gui_style.panel_bg,
             section_bg: Color::grey(0.5),
             inner_panel: gui_style.panel_bg.alpha(1.0),
diff --git a/rustdoc/src/map_gui/tools/minimap.rs.html b/rustdoc/src/map_gui/tools/minimap.rs.html
index 59ef092a22..329c5a8ccd 100644
--- a/rustdoc/src/map_gui/tools/minimap.rs.html
+++ b/rustdoc/src/map_gui/tools/minimap.rs.html
@@ -575,7 +575,7 @@
                 let rect = Polygon::rectangle(20.0, 8.0);
 
                 let default_batch = GeomBatch::from(vec![(color, rect.clone())]);
-                let hover_batch = GeomBatch::from(vec![(app.cs().hovering, rect)]);
+                let hover_batch = GeomBatch::from(vec![(color.alpha(0.5), rect)]);
 
                 let level_btn = ctx
                     .style()
diff --git a/rustdoc/src/santa/title.rs.html b/rustdoc/src/santa/title.rs.html
index 43aab7a156..ce824fa314 100644
--- a/rustdoc/src/santa/title.rs.html
+++ b/rustdoc/src/santa/title.rs.html
@@ -219,7 +219,6 @@
 216
 217
 218
-219
 
 use geom::Percent;
 use map_gui::tools::open_browser;
@@ -360,10 +359,9 @@
 
 fn unlocked_level(ctx: &mut EventCtx, app: &App, level: &Level, idx: usize) -> Widget {
     let normal = level_btn(ctx, app, level, idx);
-    let hovered = normal.clone().color(RewriteColor::Change(
-        Color::WHITE,
-        ctx.style().hovering_color,
-    ));
+    let hovered = normal
+        .clone()
+        .color(RewriteColor::Change(Color::WHITE, Color::WHITE.alpha(0.6)));
 
     ButtonBuilder::new()
         .custom_batch(normal, ControlState::Default)
diff --git a/rustdoc/src/widgetry/style/mod.rs.html b/rustdoc/src/widgetry/style/mod.rs.html
index 9ff8b34c79..fc8f3cc41d 100644
--- a/rustdoc/src/widgetry/style/mod.rs.html
+++ b/rustdoc/src/widgetry/style/mod.rs.html
@@ -103,8 +103,6 @@
 100
 101
 102
-103
-104
 
 use crate::{Color, Text};
 
@@ -116,7 +114,6 @@
     pub outline_color: Color,
     pub panel_bg: Color,
     pub hotkey_color: Color,
-    pub hovering_color: Color,
     pub loading_tips: Text,
     pub btn_solid_dark: ButtonStyle,
     pub btn_outline_dark: ButtonStyle,
@@ -144,7 +141,6 @@
             outline_color: Color::WHITE,
             panel_bg: Color::grey(0.4),
             hotkey_color: Color::GREEN,
-            hovering_color: Color::ORANGE,
             loading_tips: Text::new(),
 
             // Buttons
diff --git a/rustdoc/widgetry/struct.Style.html b/rustdoc/widgetry/struct.Style.html
index 6d2f16fbc5..b46b3ac3e1 100644
--- a/rustdoc/widgetry/struct.Style.html
+++ b/rustdoc/widgetry/struct.Style.html
@@ -1,12 +1,11 @@
 widgetry::Style - Rust
 
-
[−][src]Struct widgetry::Style
pub struct Style {
+
[−][src]Struct widgetry::Style
pub struct Style {
     pub outline_thickness: f64,
     pub outline_color: Color,
     pub panel_bg: Color,
     pub hotkey_color: Color,
-    pub hovering_color: Color,
     pub loading_tips: Text,
     pub btn_solid_dark: ButtonStyle,
     pub btn_outline_dark: ButtonStyle,
@@ -15,7 +14,7 @@
     pub btn_solid_destructive: ButtonStyle,
     pub btn_outline_destructive: ButtonStyle,
 }

-                       Fields
outline_thickness: f64outline_color: Colorpanel_bg: Colorhotkey_color: Colorhovering_color: Colorloading_tips: Textbtn_solid_dark: ButtonStylebtn_outline_dark: ButtonStylebtn_solid_light: ButtonStylebtn_outline_light: ButtonStylebtn_solid_destructive: ButtonStylebtn_outline_destructive: ButtonStyle
Implementations
impl<'a> Style[src]
fn btn_plain(&self, button_style: &ButtonStyle) -> ButtonBuilder<'a>[src]
fn btn_solid(&self, button_style: &ButtonStyle) -> ButtonBuilder<'a>[src]
fn btn_outline(&self, button_style: &ButtonStyle) -> ButtonBuilder<'a>[src]
fn btn_hotkey(
    &self, 
    button_style: &ButtonStyle, 
    label: &str, 
    key: Key
) -> ButtonBuilder<'a>[src]
impl Style[src]
pub fn standard() -> Style[src]
Trait Implementations
impl Clone for Style[src]