From c3c740d36fd8a6e9ee4665af6569d53eeb7efce8 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Sun, 21 Apr 2019 04:03:37 -0700
Subject: [PATCH] UI: Do not remove focus on mouse leave events

For the "ignore wheel" widgets, do not leave focus on mouse leave
events.  This causes unintended side effects such as not being able to
type in edit boxes, and is very annoying.
---
 UI/comboBox-ignorewheel.cpp | 5 -----
 UI/comboBox-ignorewheel.hpp | 1 -
 UI/slider-ignorewheel.cpp   | 5 -----
 UI/slider-ignorewheel.hpp   | 1 -
 UI/spinBox-ignorewheel.cpp  | 5 -----
 UI/spinBox-ignorewheel.hpp  | 1 -
 UI/volume-control.cpp       | 5 -----
 UI/volume-control.hpp       | 1 -
 8 files changed, 24 deletions(-)

diff --git a/UI/comboBox-ignorewheel.cpp b/UI/comboBox-ignorewheel.cpp
index 52c2641ec..2e8103c17 100644
--- a/UI/comboBox-ignorewheel.cpp
+++ b/UI/comboBox-ignorewheel.cpp
@@ -12,8 +12,3 @@ void ComboBoxIgnoreScroll::wheelEvent(QWheelEvent * event)
 	else
 		QComboBox::wheelEvent(event);
 }
-
-void ComboBoxIgnoreScroll::leaveEvent(QEvent * event)
-{
-	clearFocus();
-}
diff --git a/UI/comboBox-ignorewheel.hpp b/UI/comboBox-ignorewheel.hpp
index e88cd44d5..0d9155a3b 100644
--- a/UI/comboBox-ignorewheel.hpp
+++ b/UI/comboBox-ignorewheel.hpp
@@ -14,7 +14,6 @@ public:
 protected:
 
 	virtual void wheelEvent(QWheelEvent *event) override;
-	virtual void leaveEvent(QEvent *event) override;
 };
 
 
diff --git a/UI/slider-ignorewheel.cpp b/UI/slider-ignorewheel.cpp
index 91051b3f5..325f88244 100644
--- a/UI/slider-ignorewheel.cpp
+++ b/UI/slider-ignorewheel.cpp
@@ -20,8 +20,3 @@ void SliderIgnoreScroll::wheelEvent(QWheelEvent * event)
 	else
 		QSlider::wheelEvent(event);
 }
-
-void SliderIgnoreScroll::leaveEvent(QEvent * event)
-{
-	clearFocus();
-}
diff --git a/UI/slider-ignorewheel.hpp b/UI/slider-ignorewheel.hpp
index e2d8c451c..d0217eb11 100644
--- a/UI/slider-ignorewheel.hpp
+++ b/UI/slider-ignorewheel.hpp
@@ -17,7 +17,6 @@ public:
 protected:
 
 	virtual void wheelEvent(QWheelEvent *event) override;
-	virtual void leaveEvent(QEvent *event) override;
 };
 
 
diff --git a/UI/spinBox-ignorewheel.cpp b/UI/spinBox-ignorewheel.cpp
index 0c87f8b9f..549236d64 100644
--- a/UI/spinBox-ignorewheel.cpp
+++ b/UI/spinBox-ignorewheel.cpp
@@ -12,8 +12,3 @@ void SpinBoxIgnoreScroll::wheelEvent(QWheelEvent * event)
 	else
 		QSpinBox::wheelEvent(event);
 }
-
-void SpinBoxIgnoreScroll::leaveEvent(QEvent * event)
-{
-	clearFocus();
-}
diff --git a/UI/spinBox-ignorewheel.hpp b/UI/spinBox-ignorewheel.hpp
index af039a7f4..eee7ac974 100644
--- a/UI/spinBox-ignorewheel.hpp
+++ b/UI/spinBox-ignorewheel.hpp
@@ -14,7 +14,6 @@ public:
 protected:
 
 	virtual void wheelEvent(QWheelEvent *event) override;
-	virtual void leaveEvent(QEvent *event) override;
 };
 
 
diff --git a/UI/volume-control.cpp b/UI/volume-control.cpp
index f75c5ae07..6ed8d841f 100644
--- a/UI/volume-control.cpp
+++ b/UI/volume-control.cpp
@@ -514,11 +514,6 @@ void VolumeMeter::wheelEvent(QWheelEvent * event)
 	QApplication::sendEvent(focusProxy(), event);
 }
 
-void VolumeMeter::leaveEvent(QEvent * event)
-{
-	clearFocus();
-}
-
 VolumeMeter::VolumeMeter(QWidget *parent, obs_volmeter_t *obs_volmeter,
 		bool vertical)
 		: QWidget(parent), obs_volmeter(obs_volmeter),
diff --git a/UI/volume-control.hpp b/UI/volume-control.hpp
index 1edff8fdb..e24ef5c4a 100644
--- a/UI/volume-control.hpp
+++ b/UI/volume-control.hpp
@@ -200,7 +200,6 @@ public:
 	void setPeakMeterType(enum obs_peak_meter_type peakMeterType);
 	virtual void mousePressEvent(QMouseEvent *event) override;
 	virtual void wheelEvent(QWheelEvent *event) override;
-	virtual void leaveEvent(QEvent *event) override;
 
 protected:
 	void paintEvent(QPaintEvent *event) override;