From 505c2a6ab209c7dc42ec619140168b31ce1c458e Mon Sep 17 00:00:00 2001
From: Philip Daniels <Philip.Daniels1971@gmail.com>
Date: Sun, 3 Apr 2022 11:33:54 +0100
Subject: [PATCH 1/2] Make terminal paint in proper background color

---
 lapce-ui/src/panel.rs    | 11 +++++++++--
 lapce-ui/src/terminal.rs |  9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lapce-ui/src/panel.rs b/lapce-ui/src/panel.rs
index 2ac985f3..dd0646b5 100644
--- a/lapce-ui/src/panel.rs
+++ b/lapce-ui/src/panel.rs
@@ -344,6 +344,8 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, _env: &Env) {
     }
 }
 
+/// This struct is used as the outer container for a panel,
+/// it contains the heading such as "Terminal" or "File Explorer".
 pub struct PanelMainHeader {
     text: String,
     icons: Vec<LapceIcon>,
@@ -516,10 +518,15 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, _env: &Env) {
                 data.config
                     .get_color_unchecked(LapceTheme::LAPCE_DROPDOWN_SHADOW),
             );
+
+            let bg_color_name = match self.kind {
+                PanelKind::Terminal => LapceTheme::TERMINAL_BACKGROUND,
+                _ => LapceTheme::EDITOR_BACKGROUND
+            };
+
             ctx.fill(
                 rect,
-                data.config
-                    .get_color_unchecked(LapceTheme::EDITOR_BACKGROUND),
+                data.config.get_color_unchecked(bg_color_name),
             );
 
             let text_layout = ctx
diff --git a/lapce-ui/src/terminal.rs b/lapce-ui/src/terminal.rs
index de2f1636..f07eeca6 100644
--- a/lapce-ui/src/terminal.rs
+++ b/lapce-ui/src/terminal.rs
@@ -84,6 +84,8 @@ pub fn new(
     }
 }
 
+/// This struct represents the main body of the terminal, i.e. the part
+/// where the shell is presented.
 pub struct TerminalPanel {
     widget_id: WidgetId,
     split: WidgetPod<LapceTabData, LapceSplitNew>,
@@ -189,6 +191,11 @@ fn layout(
     }
 
     fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, env: &Env) {
+        let rect = ctx.size().to_rect();
+        ctx.fill(
+            rect,
+            data.config.get_color_unchecked(LapceTheme::TERMINAL_BACKGROUND),
+        );
         self.split.paint(ctx, data, env);
     }
 }
@@ -289,7 +296,7 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, env: &Env) {
             ctx.fill(
                 rect,
                 data.config
-                    .get_color_unchecked(LapceTheme::EDITOR_BACKGROUND),
+                    .get_color_unchecked(LapceTheme::TERMINAL_BACKGROUND),
             );
         });
 

From e30b05da8550bb0fc918572f19c856730d26ddb5 Mon Sep 17 00:00:00 2001
From: Philip Daniels <Philip.Daniels1971@gmail.com>
Date: Sun, 3 Apr 2022 16:18:17 +0100
Subject: [PATCH 2/2] All PanelMainHeaders use same bg color.

This backs out part of the change from the previous commit,
leaving the comment. Following discussion on Discord with
bugadani
---
 lapce-ui/src/panel.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lapce-ui/src/panel.rs b/lapce-ui/src/panel.rs
index dd0646b5..448b7673 100644
--- a/lapce-ui/src/panel.rs
+++ b/lapce-ui/src/panel.rs
@@ -519,14 +519,10 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, _env: &Env) {
                     .get_color_unchecked(LapceTheme::LAPCE_DROPDOWN_SHADOW),
             );
 
-            let bg_color_name = match self.kind {
-                PanelKind::Terminal => LapceTheme::TERMINAL_BACKGROUND,
-                _ => LapceTheme::EDITOR_BACKGROUND
-            };
-
             ctx.fill(
                 rect,
-                data.config.get_color_unchecked(bg_color_name),
+                data.config
+                    .get_color_unchecked(LapceTheme::EDITOR_BACKGROUND),
             );
 
             let text_layout = ctx