a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2025-01-05 13:05:06 +03:00
Code Issues Projects Releases Wiki Activity

just move info panel handling code

Browse Source
This commit is contained in:
Dustin Carlino 2020-01-16 16:42:25 -08:00
parent 610f8f7e46
commit eb0281a294
2 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
game/src/common/info.rs
View File

@ -1,10 +1,11 @@
use crate::common::CommonState;
use crate::common::{CommonState, Warping};
use crate::game::{msg, Transition};
use crate::helpers::{rotating_color, ID};
use crate::ui::UI;
use abstutil::prettyprint_usize;
use ezgui::{
hotkey, Button, Color, Composite, EventCtx, HorizontalAlignment, Key, Line, ManagedWidget,
Plot, RewriteColor, Series, Text, VerticalAlignment,
hotkey, Button, Color, Composite, EventCtx, EventLoopMode, HorizontalAlignment, Key, Line,
ManagedWidget, Outcome, Plot, RewriteColor, Series, Text, VerticalAlignment,
};
use geom::{Duration, Statistic, Time};
use map_model::{IntersectionID, RoadID};
@ -117,21 +118,62 @@ impl InfoPanel {
}
}
// If this returns an error message, the object is gone.
pub fn live_update(&mut self, ctx: &mut EventCtx, ui: &UI) -> Option<String> {
if let Some(a) = self.id.agent_id() {
if !ui.primary.sim.does_agent_exist(a) {
// TODO Get a TripResult, slightly more detail?
return Some(format!("{} is gone", a));
}
// (Are we done, optional transition)
pub fn event(&mut self, ctx: &mut EventCtx, ui: &mut UI) -> (bool, Option<Transition>) {
// Can click on the map to cancel
if ctx.canvas.get_cursor_in_map_space().is_some()
&& ui.primary.current_selection.is_none()
&& ui.per_obj.left_click(ctx, "stop showing info")
{
return (true, None);
}
let preserve_scroll = self.composite.preserve_scroll();
// TODO Can we be more efficient here?
*self = InfoPanel::new(self.id.clone(), ctx, ui, self.actions.clone());
self.composite.restore_scroll(ctx, preserve_scroll);
// Live update?
if ui.primary.sim.time() != self.time {
if let Some(a) = self.id.agent_id() {
if !ui.primary.sim.does_agent_exist(a) {
// TODO Get a TripResult, slightly more detail?
return (
true,
Some(Transition::Push(msg(
"Closing info panel",
vec![format!("{} is gone", a)],
))),
);
}
}
None
let preserve_scroll = self.composite.preserve_scroll();
// TODO Can we be more efficient here?
*self = InfoPanel::new(self.id.clone(), ctx, ui, self.actions.clone());
self.composite.restore_scroll(ctx, preserve_scroll);
}
match self.composite.event(ctx) {
Some(Outcome::Clicked(action)) => {
if action == "X" {
return (true, None);
} else if action == "jump to object" {
return (
false,
Some(Transition::PushWithMode(
Warping::new(
ctx,
self.id.canonical_point(&ui.primary).unwrap(),
Some(10.0),
Some(self.id.clone()),
&mut ui.primary,
),
EventLoopMode::Animation,
)),
);
} else {
ui.primary.current_selection = Some(self.id.clone());
return (true, Some(Transition::ApplyObjectAction(action)));
}
}
None => (false, None),
}
}
}

54
game/src/common/mod.rs
View File

@ -16,13 +16,12 @@ pub use self::minimap::Minimap;
pub use self::panels::{edit_map_panel, tool_panel};
pub use self::trip_explorer::TripExplorer;
pub use self::warp::Warping;
use crate::game::{msg, Transition};
use crate::game::Transition;
use crate::helpers::{list_names, ID};
use crate::render::DrawOptions;
use crate::ui::UI;
use ezgui::{
lctrl, Color, EventCtx, EventLoopMode, GfxCtx, HorizontalAlignment, Key, Line, Outcome, Text,
VerticalAlignment,
lctrl, Color, EventCtx, GfxCtx, HorizontalAlignment, Key, Line, Text, VerticalAlignment,
};
use std::collections::BTreeSet;
@ -64,53 +63,14 @@ impl CommonState {
}
if let Some(ref mut info) = self.info_panel {
// Can click on the map to cancel
if ctx.canvas.get_cursor_in_map_space().is_some()
&& ui.primary.current_selection.is_none()
&& ui.per_obj.left_click(ctx, "stop showing info")
{
let (closed, maybe_t) = info.event(ctx, ui);
if closed {
self.info_panel = None;
assert!(ui.per_obj.info_panel_open);
ui.per_obj.info_panel_open = false;
} else {
if ui.primary.sim.time() != info.time {
if let Some(err) = info.live_update(ctx, ui) {
self.info_panel = None;
assert!(ui.per_obj.info_panel_open);
ui.per_obj.info_panel_open = false;
return Some(Transition::Push(msg("Closing info panel", vec![err])));
}
}
match info.composite.event(ctx) {
Some(Outcome::Clicked(action)) => {
if action == "X" {
self.info_panel = None;
assert!(ui.per_obj.info_panel_open);
ui.per_obj.info_panel_open = false;
} else if action == "jump to object" {
return Some(Transition::PushWithMode(
Warping::new(
ctx,
info.id.canonical_point(&ui.primary).unwrap(),
Some(10.0),
Some(info.id.clone()),
&mut ui.primary,
),
EventLoopMode::Animation,
));
} else {
// TODO If the action was conditional on some other stuff, it might
// still go unused.
ui.primary.current_selection = Some(info.id.clone());
self.info_panel = None;
assert!(ui.per_obj.info_panel_open);
ui.per_obj.info_panel_open = false;
return Some(Transition::ApplyObjectAction(action));
}
}
None => {}
}
}
if let Some(t) = maybe_t {
return Some(t);
}
}