From 5e592447b799ab331fc0b87523b9e414ba988434 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Mon, 11 Oct 2021 15:33:46 -0700
Subject: [PATCH] organize trip controls vs. route controls

The file mgmt and waypoints are part of the "trip"

The toggles and details are part of the route. I considered combining
the toggle section into the "route details" section but... decided
against it to delineate "input" from "output". I could be persuaded to
keep iterating on this...
---
 game/src/ungap/trip/files.rs | 1 -
 game/src/ungap/trip/mod.rs   | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/game/src/ungap/trip/files.rs b/game/src/ungap/trip/files.rs
index ba3c9f1f06..31b2d304f6 100644
--- a/game/src/ungap/trip/files.rs
+++ b/game/src/ungap/trip/files.rs
@@ -133,7 +133,6 @@ impl TripManagement {
                     .build_widget(ctx, "next trip"),
             ]),
         ])
-        .section(ctx)
     }
 
     pub fn on_click(&mut self, ctx: &mut EventCtx, app: &App, action: &str) -> Option<Transition> {
diff --git a/game/src/ungap/trip/mod.rs b/game/src/ungap/trip/mod.rs
index 8e8a69bf10..ea7f05358a 100644
--- a/game/src/ungap/trip/mod.rs
+++ b/game/src/ungap/trip/mod.rs
@@ -119,7 +119,12 @@ impl TripPlanner {
 
     fn update_input_panel(&mut self, ctx: &mut EventCtx, app: &App, main_route: Widget) {
         let col = Widget::col(vec![
-            self.files.get_panel_widget(ctx),
+            Widget::col(vec![
+                self.files.get_panel_widget(ctx),
+                Widget::horiz_separator(ctx, 1.0),
+                self.waypoints.get_panel_widget(ctx),
+            ])
+            .section(ctx),
             Widget::row(vec![
                 Toggle::checkbox(
                     ctx,
@@ -135,7 +140,6 @@ impl TripPlanner {
                 ),
             ])
             .section(ctx),
-            self.waypoints.get_panel_widget(ctx).section(ctx),
             main_route.section(ctx),
         ]);