a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-18 20:02:18 +03:00
Code Issues Projects Releases Wiki Activity
6,154 Commits 85 Branches 166 Tags 395 MiB
607ccd0e78
Commit Graph

6154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kirk
1a3d1b4cdb
reconcile new button styles w/ dark theme (#475) 2021-01-22 21:21:38 -08:00
Dustin Carlino
72d3598e70 Merge branch 'michaelkirk-mkirk/btn-fix' 2021-01-22 21:14:22 -08:00
Dustin Carlino
4446d99fad Merge branch 'mkirk/btn-fix' of https://github.com/michaelkirk/abstreet into michaelkirk-mkirk/btn-fix 2021-01-22 21:13:13 -08:00
Dustin Carlino
db115e6fc6 Merge branch 'michaelkirk-mkirk/conventional-btn-names' 2021-01-22 21:10:26 -08:00
Dustin Carlino
85effcad49 Merge branch 'mkirk/conventional-btn-names' of https://github.com/michaelkirk/abstreet into michaelkirk-mkirk/conventional-btn-names 2021-01-22 21:09:08 -08:00
Michael Kirk
e1b4ab537f better docs 2021-01-22 21:06:48 -08:00
Michael Kirk
f621a2b7d0 cache SVG's when reasonable. Clarify when they aren't cached. 2021-01-22 21:06:48 -08:00
Michael Kirk
ee752cf4d9 cleanup with include_labeled_bytes! 2021-01-22 21:06:48 -08:00
Michael Kirk
a9fbe98a44 compile in asset bytes for widgetry assets 2021-01-22 21:06:48 -08:00
Michael Kirk
4ee6564032 bake-in widgetry assets: image_path -> image_source::{Path, Bytes} 2021-01-22 21:06:48 -08:00
Michael Kirk
3855f284b8 Fix hotkey conflict 
Even though we *usually* want these hotkeys for next/prev, sometimes we
don't, and the damage of forgetting to add them to a new pager is less
than the damage done if we forget to remove them and clobber something
important like the speedup/slowdown controls.
 2021-01-22 15:31:33 -06:00
Michael Kirk
87fe16b6ad use proper button in pager 
broken in the recent button overhaul
 2021-01-22 15:30:42 -06:00
Michael Kirk
1990642dee More conventional button names 
This was all done by search/replace, and should not affect
functionality.

Goals:

- be consistent with the figma terminology.
- consistently order:
  "btn_{solid|outline|plain}_{dark|light}_{text|image|dropdown|back|etc}"
 2021-01-22 13:11:42 -06:00
Michael Kirk
8579add567 better docs 2021-01-22 10:23:50 -06:00
Michael Kirk
1325c115a1 cache SVG's when reasonable. Clarify when they aren't cached. 2021-01-22 09:54:50 -06:00
Michael Kirk
202aec77cf cleanup with include_labeled_bytes! 2021-01-22 09:54:50 -06:00
Michael Kirk
4e48de6185 compile in asset bytes for widgetry assets 2021-01-22 09:54:50 -06:00
Michael Kirk
7bc9145ce9 bake-in widgetry assets: image_path -> image_source::{Path, Bytes} 2021-01-22 09:54:50 -06:00
Dustin Carlino
2505d64e8b Always use ctx.style() to construct buttons. Remove the indirection through app's colorscheme. 2021-01-22 07:45:05 -08:00
Michael Kirk
ca93d438db fixup tabs 2021-01-22 07:44:46 -08:00
Dustin Carlino
f78bb8b711 Attempt to display the Timer progress and logs in separate parts of the screen when running the importer. #262 
Lots of problems, so disabled by default.
 2021-01-21 19:57:38 -08:00
Dustin Carlino
c9c6f240ae Remove timer.{note, warn, error} in favor of the log crate. #262 
Originally, the intention of the deleted calls was to not interrupt
Timer progress bars with warnings. But the output of things like the
importer is impossible to read anyway. Strongly considering explicitly
sending logs and timing info to separate places and using something like
multitail for live progress.

Unplumb timer from LOADS of places that just needed it for logging.
 2021-01-21 19:22:02 -08:00
Dustin Carlino
dc19d11f64 Make the file management menu in edit mode occupy the center of the screen. 2021-01-21 15:36:21 -08:00
Michael Kirk
02e3235de2 adapt tabs to new button designs 2021-01-21 15:25:46 -08:00
Michael Kirk
79b9d9f961 fix checkbox color for Info > Traffic > "Show before {}" 2021-01-21 15:25:46 -08:00
Michael Kirk
882de86661 Maybe fix weird toggle background 2021-01-21 15:25:46 -08:00
Michael Kirk
e10a8bd2a3 proper its 2021-01-21 15:25:46 -08:00
Michael Kirk
2b8511251a fix scaling: replace remaining buttons with baked-in-text 2021-01-21 15:25:46 -08:00
Michael Kirk
90b6da7265 apply new delete icon, fix button spacing in signal editor 2021-01-21 15:25:46 -08:00
Michael Kirk
600d91896e remove redundant edit.svg, use pencil.svg 2021-01-21 15:25:46 -08:00
Michael Kirk
12b220d606 replace proper "edit" (pencil) icon 2021-01-21 15:25:46 -08:00
Michael Kirk
116edc5423 Fix missized lane editing tools 2021-01-21 15:25:46 -08:00
Michael Kirk
6920d324f7 v-align alert 2021-01-21 15:25:46 -08:00
Michael Kirk
f9fdce9637 replace arrow text with arrow image 2021-01-21 15:25:46 -08:00
Michael Kirk
f218d72390 docs 2021-01-21 15:25:46 -08:00
Michael Kirk
4454b4a50f capture "disabled" pattern 2021-01-21 15:25:46 -08:00
Michael Kirk
4989887117 remove final references to Btn 2021-01-21 15:25:46 -08:00
Michael Kirk
542600da2f Replace Btn::fg_text.inactive 2021-01-21 15:25:46 -08:00
Michael Kirk
2b8e77de9f manual replace of remaining hotkey Btn::text_fg 2021-01-21 15:25:46 -08:00
Michael Kirk
de527bc9d8 remove unused imports 2021-01-21 15:25:46 -08:00
Michael Kirk
0cf49d2fc6 proper color for "Trash" (delete) buttons 2021-01-21 15:25:46 -08:00
Michael Kirk
1f75145a8a introduce btn_next/btn_prev, parameterize disabled to simplify common usage 2021-01-21 15:25:46 -08:00
Michael Kirk
b924d40daa regex update Btn::text_fg simple hotkeys, inline &str 2021-01-21 15:25:46 -08:00
Michael Kirk
a2c5ce0fb3 regex upgrade Btn::text_fg: No hotkeys, inline &str 
Btn\:\:text_fg\("([^"]*)"\).build_def\(ctx, None\)
ctx.style().btn_secondary_light_text("$1").build_def(ctx)
 2021-01-21 15:25:46 -08:00
Michael Kirk
bfb190a730 manually update remaining Btn::text_bg2 2021-01-21 15:25:46 -08:00
Michael Kirk
a5b6dca62a replace Btn::text_bg2 w/ regex 
In case I have to revisit, here's the regex I used:
    Btn::text_bg2\(([^)]*)\)*.build_def\(ctx, ([^()]*)\)
    ctx.style().btn_primary_dark_text($1).hotkey($2).build_def(ctx)

And something like this for the "no hotkey" case
    Btn::text_bg2\(([^)]*)\)*.build_def\(ctx, None\)
    ctx.style().btn_primary_dark_text($1).build_def(ctx)
 2021-01-21 15:25:46 -08:00
Michael Kirk
7270ff31af use icon button for "jump to time" 2021-01-21 15:25:46 -08:00
Michael Kirk
652c35b220 replace Btn::text_bg 2021-01-21 15:25:46 -08:00
Michael Kirk
54e937408a remove remaining Btn::plaintext 2021-01-21 15:25:46 -08:00
Michael Kirk
f382c08d55 replace text arrows with svg arrows for traffic signal editor 2021-01-21 15:25:46 -08:00