From f0c81ea6dc420786ec58b0f1402d7696e221999d Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 30 Jan 2022 10:45:25 +1100
Subject: remove redundant popup checks

---
 pkg/gui/global_handlers.go    | 8 --------
 pkg/gui/line_by_line_panel.go | 8 --------
 pkg/gui/status_panel.go       | 8 --------
 3 files changed, 24 deletions(-)

(limited to 'pkg/gui')

diff --git a/pkg/gui/global_handlers.go b/pkg/gui/global_handlers.go
index 380704fbc..04f7efb61 100644
--- a/pkg/gui/global_handlers.go
+++ b/pkg/gui/global_handlers.go
@@ -181,10 +181,6 @@ func (gui *Gui) handleRefresh() error {
 }
 
 func (gui *Gui) handleMouseDownMain() error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
 	switch gui.currentSideContext() {
 	case gui.State.Contexts.Files:
 		// set filename, set primary/secondary selected, set line number, then switch context
@@ -199,10 +195,6 @@ func (gui *Gui) handleMouseDownMain() error {
 }
 
 func (gui *Gui) handleMouseDownSecondary() error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
 	switch gui.g.CurrentView() {
 	case gui.Views.Files:
 		return gui.Controllers.Files.EnterFile(types.OnFocusOpts{ClickedViewName: "secondary", ClickedViewLineIdx: gui.Views.Secondary.SelectedLineIdx()})
diff --git a/pkg/gui/line_by_line_panel.go b/pkg/gui/line_by_line_panel.go
index b2d5f2382..f55b339a3 100644
--- a/pkg/gui/line_by_line_panel.go
+++ b/pkg/gui/line_by_line_panel.go
@@ -106,10 +106,6 @@ func (gui *Gui) refreshAndFocusLblPanel(state *LblPanelState) error {
 
 func (gui *Gui) handleLBLMouseDown() error {
 	return gui.withLBLActiveCheck(func(state *LblPanelState) error {
-		if gui.popupPanelFocused() {
-			return nil
-		}
-
 		state.SelectNewLineForRange(gui.Views.Main.SelectedLineIdx())
 
 		return gui.refreshAndFocusLblPanel(state)
@@ -118,10 +114,6 @@ func (gui *Gui) handleLBLMouseDown() error {
 
 func (gui *Gui) handleMouseDrag() error {
 	return gui.withLBLActiveCheck(func(state *LblPanelState) error {
-		if gui.popupPanelFocused() {
-			return nil
-		}
-
 		state.SelectLine(gui.Views.Main.SelectedLineIdx())
 
 		return gui.refreshAndFocusLblPanel(state)
diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go
index 1b53fc39c..366d55441 100644
--- a/pkg/gui/status_panel.go
+++ b/pkg/gui/status_panel.go
@@ -30,10 +30,6 @@ func (gui *Gui) handleCheckForUpdate() error {
 
 func (gui *Gui) handleStatusClick() error {
 	// TODO: move into some abstraction (status is currently not a listViewContext where a lot of this code lives)
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
 	currentBranch := gui.getCheckedOutBranch()
 	if currentBranch == nil {
 		// need to wait for branches to refresh
@@ -79,10 +75,6 @@ func formatWorkingTreeState(rebaseMode enums.RebaseMode) string {
 
 func (gui *Gui) statusRenderToMain() error {
 	// TODO: move into some abstraction (status is currently not a listViewContext where a lot of this code lives)
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
 	dashboardString := strings.Join(
 		[]string{
 			lazygitTitle(),
-- 
cgit v1.2.3