From 9700f9f5ee5ccb019bf4efd00740413888ce9ce5 Mon Sep 17 00:00:00 2001
From: Stephan Dilly <dilly.stephan@gmail.com>
Date: Fri, 28 May 2021 09:49:44 +0200
Subject: [PATCH] fix margin in file-tree

---
 src/components/revision_files.rs       | 11 +++++++-
 src/components/revision_files_popup.rs | 36 +++++++++-----------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/components/revision_files.rs b/src/components/revision_files.rs
index 12d343b3..3169a923 100644
--- a/src/components/revision_files.rs
+++ b/src/components/revision_files.rs
@@ -194,10 +194,20 @@ impl RevisionFilesComponent {
 
         let is_tree_focused = matches!(self.focus, Focus::Tree);
 
+        let title = format!(
+            "Files at [{}]",
+            self.revision
+                .map(|c| c.get_short_string())
+                .unwrap_or_default()
+        );
         ui::draw_list_block(
             f,
             area,
             Block::default()
+                .title(Span::styled(
+                    title,
+                    self.theme.title(is_tree_focused),
+                ))
                 .borders(Borders::ALL)
                 .border_style(self.theme.block(is_tree_focused)),
             items,
@@ -223,7 +233,6 @@ impl DrawableComponent for RevisionFilesComponent {
     ) -> Result<()> {
         let chunks = Layout::default()
             .direction(Direction::Horizontal)
-            .margin(1)
             .constraints(
                 [
                     Constraint::Percentage(40),
diff --git a/src/components/revision_files_popup.rs b/src/components/revision_files_popup.rs
index c65401ec..4f928ec1 100644
--- a/src/components/revision_files_popup.rs
+++ b/src/components/revision_files_popup.rs
@@ -13,17 +13,9 @@ use anyhow::Result;
 use asyncgit::{sync::CommitId, AsyncNotification};
 use crossbeam_channel::Sender;
 use crossterm::event::Event;
-use tui::{
-    backend::Backend,
-    layout::Rect,
-    text::Span,
-    widgets::{Block, Borders, Clear},
-    Frame,
-};
+use tui::{backend::Backend, layout::Rect, widgets::Clear, Frame};
 
 pub struct RevisionFilesPopup {
-    title: String,
-    theme: SharedTheme,
     visible: bool,
     key_config: SharedKeyConfig,
     files: RevisionFilesComponent,
@@ -38,14 +30,12 @@ impl RevisionFilesPopup {
         key_config: SharedKeyConfig,
     ) -> Self {
         Self {
-            title: String::new(),
             files: RevisionFilesComponent::new(
                 queue,
                 sender,
-                theme.clone(),
+                theme,
                 key_config.clone(),
             ),
-            theme,
             visible: false,
             key_config,
         }
@@ -54,8 +44,6 @@ impl RevisionFilesPopup {
     ///
     pub fn open(&mut self, commit: CommitId) -> Result<()> {
         self.files.set_commit(commit)?;
-        self.title =
-            format!("Files at [{}]", commit.get_short_string());
         self.show()?;
 
         Ok(())
@@ -80,16 +68,16 @@ impl DrawableComponent for RevisionFilesPopup {
     ) -> Result<()> {
         if self.is_visible() {
             f.render_widget(Clear, area);
-            f.render_widget(
-                Block::default()
-                    .borders(Borders::TOP)
-                    .title(Span::styled(
-                        format!(" {}", self.title),
-                        self.theme.title(true),
-                    ))
-                    .border_style(self.theme.block(true)),
-                area,
-            );
+            // f.render_widget(
+            //     Block::default()
+            //         .borders(Borders::TOP)
+            //         .title(Span::styled(
+            //             format!(" {}", self.title),
+            //             self.theme.title(true),
+            //         ))
+            //         .border_style(self.theme.block(true)),
+            //     area,
+            // );
 
             self.files.draw(f, area)?;
         }