Always show the status bar.

2017-08-30 18:51:19 +01:00 · 2017-08-30 18:51:19 +01:00 · 975637edc1
commit 975637edc1
parent e63dd40320
2 changed files with 12 additions and 13 deletions
--- a/tests/golden-files/help
+++ b/tests/golden-files/help
@ -56,5 +56,5 @@
 │                                                                                                  │
 │                                                                                                  │
 │                                                                                                  │
-│                                                                                                  │
-└──────────────────────────────────────────────────────────────────────────────────────────────────┘(B[m
+└──────────────────────────────────────────────────────────────────────────────────────────────────┘
+(B[m[38;2;255;255;255m[48;2;0;0;0m[4m (B[m[38;2;0;255;0m[48;2;0;0;0m[4mh(B[m[38;2;255;255;255m[48;2;0;0;0m[4melp (B[m[38;2;0;255;0m[48;2;0;0;0m[4mq(B[m[38;2;255;255;255m[48;2;0;0;0m[4muit (B[m[38;2;0;255;0m[48;2;0;0;0m[4mtab(B[m[38;2;255;255;255m[48;2;0;0;0m[4m:focus (B[m[38;2;0;255;0m[48;2;0;0;0m[4mt(B[m[38;2;255;255;255m[48;2;0;0;0m[4murn (B[m[38;2;0;255;0m[48;2;0;0;0m[4ml(B[m[38;2;255;255;255m[48;2;0;0;0m[4mog (B[m[38;2;0;255;0m[48;2;0;0;0m[4me(B[m[38;2;255;255;255m[48;2;0;0;0m[4mdit (B[m[38;2;0;255;0m[48;2;0;0;0m[4mn(B[m[38;2;255;255;255m[48;2;0;0;0m[4mext (B[m[38;2;0;255;0m[48;2;0;0;0m[4mp(B[m[38;2;255;255;255m[48;2;0;0;0m[4mause (B[m[38;2;0;255;0m[48;2;0;0;0m[4mo(B[m[38;2;255;255;255m[48;2;0;0;0m[4mrder (B[m[38;2;0;255;0m[48;2;0;0;0m[4mr(B[m[38;2;255;255;255m[48;2;0;0;0m[4mefresh (B[m[38;2;0;255;0m[48;2;0;0;0m[4mf(B[m[38;2;255;255;255m[48;2;0;0;0m[4mullscreen     (B[m[38;2;90;90;255m[48;2;0;0;0m[4mrunning(B[m[38;2;255;255;255m[48;2;0;0;0m[4m  order:directory (B[m
--- a/vigil/main.py
+++ b/vigil/main.py
@ -873,19 +873,18 @@ class Screen:
            progress_bar_size)

    def appearance(self, dimensions):
-        if self._is_fullscreen and self._is_summary_focused:
-            return self._summary_border.appearance(dimensions)
-        if self._is_help_visible:
-            return self._help_widget.appearance(dimensions)
        self._fix_listing()
-        if self._is_fullscreen:
-            return self._listing.appearance(dimensions)
+        if self._is_help_visible:
+            body = self._help_widget
+        elif self._is_fullscreen:
+            body = (self._summary_border if self._is_summary_focused
+                    else self._listing)
+        else:
+            body = (self._layouts[self._is_log_visible]
+                    [self._is_listing_portrait])
        width, height = max(dimensions[0], 10), max(dimensions[1], 20)
-        status_bar_appearance = self._get_status_bar(width)
-        result = (self._layouts[self._is_log_visible]
-                  [self._is_listing_portrait].appearance(
-                      (width, height-len(status_bar_appearance))) +
-                  status_bar_appearance)
+        result = (body.appearance((width, height-1)) +
+                  self._get_status_bar(width))
        return (result if (width, height) == dimensions
                else fill3.appearance_resize(result, dimensions))