From 48ac50e224359e490f38800f9c89512d02763bb3 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Mon, 21 Jul 2014 04:24:03 +1000
Subject: [PATCH] There is a mouse Leave event after all.. Fix the focus
 glitches properly

---
 sleepyhead/Graphs/gGraphView.cpp | 7 +++++++
 sleepyhead/Graphs/gGraphView.h   | 3 ++-
 sleepyhead/preferencesdialog.cpp | 6 ------
 sleepyhead/preferencesdialog.h   | 3 ---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp
index 2f161c84..beaad9c7 100644
--- a/sleepyhead/Graphs/gGraphView.cpp
+++ b/sleepyhead/Graphs/gGraphView.cpp
@@ -1074,6 +1074,13 @@ void gGraphView::paintGL()
     }
 }
 
+void gGraphView::leaveEvent(QEvent * event)
+{
+    Q_UNUSED(event);
+    releaseKeyboard();
+}
+
+
 // For manual scrolling
 void gGraphView::setOffsetY(int offsetY)
 {
diff --git a/sleepyhead/Graphs/gGraphView.h b/sleepyhead/Graphs/gGraphView.h
index 9d094fea..b129af69 100644
--- a/sleepyhead/Graphs/gGraphView.h
+++ b/sleepyhead/Graphs/gGraphView.h
@@ -202,7 +202,6 @@ class gGraphView
     virtual ~gGraphView();
     virtual void closeEvent(QCloseEvent * event);
 
-
     //! \brief Add gGraph g to this gGraphView, in the requested graph-linkage group
     void addGraph(gGraph *g, short group = 0);
 
@@ -387,6 +386,8 @@ class gGraphView
 
   protected:
 
+    virtual void leaveEvent (QEvent * event);
+
     //! \brief The heart of the drawing code
 #ifdef BROKEN_OPENGL_BUILD
     virtual void paintEvent(QPaintEvent *);
diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp
index 20239cbe..8a8c5643 100644
--- a/sleepyhead/preferencesdialog.cpp
+++ b/sleepyhead/preferencesdialog.cpp
@@ -45,12 +45,6 @@ MaskProfile masks[] = {
 };
 const int num_masks = sizeof(masks) / sizeof(MaskProfile);
 
-void PreferencesDialog::showEvent(QShowEvent * event)
-{
-    mainwin->getDaily()->graphView()->releaseKeyboard();
-    mainwin->getOverview()->graphView()->releaseKeyboard();
-}
-
 PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
     QDialog(parent),
     ui(new Ui::PreferencesDialog),
diff --git a/sleepyhead/preferencesdialog.h b/sleepyhead/preferencesdialog.h
index 9776a4f1..5740a709 100644
--- a/sleepyhead/preferencesdialog.h
+++ b/sleepyhead/preferencesdialog.h
@@ -68,9 +68,6 @@ class PreferencesDialog : public QDialog
     //! \brief Updates the date text of the last time updates where checked
     void RefreshLastChecked();
 
-  protected:
-    virtual void showEvent(QShowEvent * event);
-
   private slots:
     void on_eventTable_doubleClicked(const QModelIndex &index);
     void on_combineSlider_valueChanged(int value);