little cleanup

Stephan Dilly · Stephan Dilly · commit 145bc90e4c7d · 2020-04-12T01:50:34.000+02:00
diff --git a/src/app.rs b/src/app.rs
@@ -322,10 +322,7 @@ impl App {
         }
 
         //TODO: use a new popups_list call for this
-        let main_cmds_available = !self.commit.is_visible()
-            && !self.help.is_visible()
-            && !self.reset.is_visible()
-            && !self.msg.is_visible();
+        let main_cmds_available = !self.any_popup_visible();
 
         {
             {
@@ -416,6 +413,13 @@ impl App {
         None
     }
 
+    fn any_popup_visible(&self) -> bool {
+        self.commit.is_visible()
+            || self.help.is_visible()
+            || self.reset.is_visible()
+            || self.msg.is_visible()
+    }
+
     fn draw_popups<B: Backend>(&self, f: &mut Frame<B>) {
         let size = f.size();
 

Original file line number	Diff line number	Diff line change
`@@ -322,10 +322,7 @@ impl App {`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`//TODO: use a new popups_list call for this`
`325`		`- let main_cmds_available = !self.commit.is_visible()`
`326`		`- && !self.help.is_visible()`
`327`		`- && !self.reset.is_visible()`
`328`		`- && !self.msg.is_visible();`
	`325`	`+ let main_cmds_available = !self.any_popup_visible();`
`329`	`326`
`330`	`327`	`{`
`331`	`328`	`{`
`@@ -416,6 +413,13 @@ impl App {`
`416`	`413`	`None`
`417`	`414`	`}`
`418`	`415`
	`416`	`+ fn any_popup_visible(&self) -> bool {`
	`417`	`+ self.commit.is_visible()`
	`418`	`+ \|\| self.help.is_visible()`
	`419`	`+ \|\| self.reset.is_visible()`
	`420`	`+ \|\| self.msg.is_visible()`
	`421`	`+ }`
	`422`	`+`
`419`	`423`	`fn draw_popups<B: Backend>(&self, f: &mut Frame<B>) {`
`420`	`424`	`let size = f.size();`
`421`	`425`