Workflows: more map layout fixes [EC-791, EC-792] (#5930)

GitOrigin-RevId: 4ee27bb2c326c0b6026252ac08b64f379243fb72
descarteslabs · Dec 10, 2019 · 8c1388d · 8c1388d
1 parent 4079b55
commit 8c1388d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/descarteslabs/workflows/interactive/layer.py b/descarteslabs/workflows/interactive/layer.py
@@ -95,7 +95,8 @@ def __init__(self, image, *args, **kwargs):
             self.set_trait(
                 "autoscale_progress",
                 ClearableOutput(
-                    widgets.Output(), layout=widgets.Layout(max_height="20rem")
+                    widgets.Output(),
+                    layout=widgets.Layout(max_height="10rem", flex="1 0 auto"),
                 ),
             )
             self.set_parameters(**params)

diff --git a/descarteslabs/workflows/interactive/layer_controller.py b/descarteslabs/workflows/interactive/layer_controller.py
@@ -25,7 +25,8 @@ def __init__(self, map):
         # initialize with the current layers on the map, if any
 
         self.layout.overflow = "auto"
-        self.layout.max_height = "30rem"
+        self.layout.max_height = "12rem"
+        self.layout.flex = "1 0 auto"
 
     def _layers_changed(self, change):
         new_layers = change["new"]

diff --git a/descarteslabs/workflows/interactive/lonlat.py b/descarteslabs/workflows/interactive/lonlat.py
@@ -64,4 +64,6 @@ def __init__(self, map):
 
         super(PositionController, self).__init__(children=(lonlat, zoom_label, zoom))
 
-        self.layout.overflow = "initial"
+        self.layout.overflow = "hidden"
+        self.layout.flex = "1 0 auto"
+        self.layout.padding = "2px 0"
diff --git a/descarteslabs/workflows/interactive/map_.py b/descarteslabs/workflows/interactive/map_.py
@@ -97,15 +97,18 @@ def on_clear():
                     pass
 
         self.errors = ClearableOutput(
-            map.error_log, on_clear=on_clear, layout=widgets.Layout(max_height="20rem")
+            map.error_log,
+            on_clear=on_clear,
+            layout=widgets.Layout(max_height="20rem", flex="1 0 auto"),
         )
 
         self.autoscale_outputs = widgets.VBox(
             [
                 x.autoscale_progress
                 for x in reversed(self.map.layers)
                 if isinstance(x, WorkflowsLayer)
-            ]
+            ],
+            layout=widgets.Layout(flex="1 0 auto", max_height="16rem"),
         )
 
         super(MapApp, self).__init__(