Use Span::styled in .title rather than .title_style in Paragraph

Author: WizardOhio24

src/components/commitlist.rs

@@ -318,9 +318,11 @@ impl DrawableComponent for CommitList {
             .block(
                 Block::default()
                     .borders(Borders::ALL)
-                    .title(title.as_str())
-                    .border_style(self.theme.block(true))
-                    .title_style(self.theme.title(true)),
+                    .title(Span::styled(
+                        title.as_str(),
+                        self.theme.title(true),
+                    ))
+                    .border_style(self.theme.block(true)),
             )
             .alignment(Alignment::Left),
             area,

src/components/diff.rs

@@ -576,10 +576,12 @@ impl DrawableComponent for DiffComponent {
         f.render_widget(
             Paragraph::new(txt).block(
                 Block::default()
-                    .title(title.as_str())
+                    .title(Span::styled(
+                        title.as_str(),
+                        self.theme.title(self.focused),
+                    ))
                     .borders(Borders::ALL)
-                    .border_style(self.theme.block(self.focused))
-                    .title_style(self.theme.title(self.focused)),
+                    .border_style(self.theme.block(self.focused)),
             ),
             r,
         );

src/components/externaleditor.rs

@@ -117,7 +117,6 @@ impl DrawableComponent for ExternalEditorComponent {
                         Block::default()
                             .borders(Borders::ALL)
                             .border_type(BorderType::Thick)
-                            .title_style(self.theme.title(true))
                             .border_style(self.theme.block(true)),
                     )
                     .style(self.theme.text_danger()),

src/components/mod.rs

@@ -193,9 +193,8 @@ fn dialog_paragraph<'a>(
     Paragraph::new(Spans::from(content))
         .block(
             Block::default()
-                .title(title)
+                .title(Span::styled(title, theme.title(focused)))
                 .borders(Borders::ALL)
-                .title_style(theme.title(focused))
                 .border_style(theme.block(focused)),
         )
         .alignment(Alignment::Left)
@@ -210,10 +209,9 @@ fn popup_paragraph<'a>(
     Paragraph::new(Spans::from(content))
         .block(
             Block::default()
-                .title(title)
+                .title(Span::styled(title, theme.title(focused)))
                 .borders(Borders::ALL)
                 .border_type(BorderType::Thick)
-                .title_style(theme.title(focused))
                 .border_style(theme.block(focused)),
         )
         .alignment(Alignment::Left)

src/components/msg.rs

@@ -45,8 +45,10 @@ impl DrawableComponent for MsgComponent {
             Paragraph::new(txt)
                 .block(
                     Block::default()
-                        .title(self.title.as_str())
-                        .title_style(self.theme.text_danger())
+                        .title(Span::styled(
+                            self.title.as_str(),
+                            self.theme.text_danger(),
+                        ))
                         .borders(Borders::ALL)
                         .border_type(BorderType::Thick),
                 )

src/components/push.rs

@@ -19,6 +19,7 @@ use tui::{
     backend::Backend,
     layout::Rect,
     style::{Color, Style},
+    text::Span,
     widgets::{Block, BorderType, Borders, Clear, Gauge},
     Frame,
 };
@@ -146,10 +147,12 @@ impl DrawableComponent for PushComponent {
                     .label(state.as_str())
                     .block(
                         Block::default()
-                            .title(strings::PUSH_POPUP_MSG)
+                            .title(Span::styled(
+                                strings::PUSH_POPUP_MSG,
+                                self.theme.title(true),
+                            ))
                             .borders(Borders::ALL)
                             .border_type(BorderType::Thick)
-                            .title_style(self.theme.title(true))
                             .border_style(self.theme.block(true)),
                     )
                     .style(

src/ui/scrolllist.rs

@@ -77,9 +77,8 @@ pub fn draw_list<'b, B: Backend, L>(
     let list = ScrollableList::new(items)
         .block(
             Block::default()
-                .title(title)
+                .title(Span::styled(title, theme.title(selected)))
                 .borders(Borders::ALL)
-                .title_style(theme.title(selected))
                 .border_style(theme.block(selected)),
         )
         .scroll(select.unwrap_or_default());