From de018294e49a2826b6f33dc2069b8bba448ec516 Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <el13635@mail.ntua.gr>
Date: Fri, 13 Nov 2020 18:36:29 +0200
Subject: [PATCH] conf/themes: make notifications bg default color instead of
 red

---
 docs/samples/themes/orca.toml | 2 +-
 src/conf/themes.rs            | 2 +-
 src/state.rs                  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/samples/themes/orca.toml b/docs/samples/themes/orca.toml
index 7f5aab42..82c707ec 100644
--- a/docs/samples/themes/orca.toml
+++ b/docs/samples/themes/orca.toml
@@ -51,7 +51,7 @@ color_aliases = { "neon_green" = "#6ef9d4",  "darkgrey" = "#4a4a4a",  "neon_purp
 "pager.highlight_search" = { fg = "White", bg = "Teal", attrs = "Bold" }
 "pager.highlight_search_current" = { fg = "White", bg = "NavyBlue", attrs = "Bold" }
 "status.bar" = { fg = "White", bg = "Black", attrs = "theme_default" }
-"status.notification" = { fg = "Plum1", bg = "DarkRed", attrs = "theme_default" }
+"status.notification" = { fg = "Plum1", bg = "theme_default", attrs = "theme_default" }
 "tab.bar" = { fg = "theme_default", bg = "theme_default", attrs = "theme_default" }
 "tab.focused" = { fg = "theme_default", bg = "theme_default", attrs = "theme_default" }
 "tab.unfocused" = { fg = "$darkgrey", bg = "Black", attrs = "theme_default" }
diff --git a/src/conf/themes.rs b/src/conf/themes.rs
index 5ac7c40a..dc23129c 100644
--- a/src/conf/themes.rs
+++ b/src/conf/themes.rs
@@ -1313,7 +1313,7 @@ impl Default for Themes {
         }
         add!("theme_default", dark = { fg: Color::Default, bg: Color::Default, attrs: Attr::DEFAULT }, light = { fg: Color::Default, bg: Color::Default, attrs: Attr::DEFAULT });
         add!("status.bar", dark = { fg: Color::Byte(123), bg: Color::Byte(26) }, light = { fg: Color::Byte(123), bg: Color::Byte(26) });
-        add!("status.notification", dark = { fg: Color::Byte(219), bg: Color::Byte(88) }, light = { fg: Color::Byte(219), bg: Color::Byte(88) });
+        add!("status.notification", dark = { fg: Color::Byte(219), bg: Color::Default }, light = { fg: Color::Byte(219), bg: Color::Default });
 
         add!("tab.focused");
         add!("tab.unfocused", dark = { fg: Color::Byte(15), bg: Color::Byte(8), }, light = { fg: Color::Byte(15), bg: Color::Byte(8), });
diff --git a/src/state.rs b/src/state.rs
index 009d5328..523629fe 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -670,7 +670,8 @@ impl State {
                         false,
                         false,
                     );
-                    for row in self.overlay_grid.bounds_iter(displ_area) {
+                    let box_displ_area = create_box(&mut self.overlay_grid, displ_area);
+                    for row in self.overlay_grid.bounds_iter(box_displ_area) {
                         for c in row {
                             self.overlay_grid[c]
                                 .set_ch(' ')
@@ -679,8 +680,7 @@ impl State {
                                 .set_attrs(noto_colors.attrs);
                         }
                     }
-                    let ((x, mut y), box_displ_area_bottom_right) =
-                        create_box(&mut self.overlay_grid, displ_area);
+                    let ((x, mut y), box_displ_area_bottom_right) = box_displ_area;
                     for line in msg_lines
                         .into_iter()
                         .chain(Some(String::new()))