From 6a7ffac96bc701c1688d5a2f903aa31c9ff6a3cd Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Mon, 21 Jul 2014 04:05:36 +1000
Subject: [PATCH] Fix keyboard focus glitch

---
 sleepyhead/Graphs/gLineChart.cpp | 2 +-
 sleepyhead/preferencesdialog.cpp | 5 ++++-
 sleepyhead/preferencesdialog.h   | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index 186e8eb7..6251e55c 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -266,7 +266,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
             int wid, h;
             GetTextExtent(text, wid, h);
-            w.renderText(text, left + width/2 - wid/2, top-h+7);
+            w.renderText(text, left + width/2 - wid/2, top-h+5);
         }
 
     }
diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp
index f67e4ce5..461f396a 100644
--- a/sleepyhead/preferencesdialog.cpp
+++ b/sleepyhead/preferencesdialog.cpp
@@ -45,6 +45,10 @@ MaskProfile masks[] = {
 };
 const int num_masks = sizeof(masks) / sizeof(MaskProfile);
 
+void PreferencesDialog::showEvent(QShowEvent * event)
+{
+    mainwin->getDaily()->graphView()->releaseKeyboard();
+}
 
 PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
     QDialog(parent),
@@ -297,7 +301,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
 
     resetGraphModel();
 
-    grabKeyboard();
     //    tree->sortByColumn(0,Qt::AscendingOrder);
 }
 
diff --git a/sleepyhead/preferencesdialog.h b/sleepyhead/preferencesdialog.h
index dae06f4f..9776a4f1 100644
--- a/sleepyhead/preferencesdialog.h
+++ b/sleepyhead/preferencesdialog.h
@@ -68,6 +68,9 @@ 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);
@@ -102,6 +105,7 @@ private:
     //! \brief Populates the Graph Model view with data from the Daily, Overview & Oximetry gGraphView objects
     void resetGraphModel();
 
+
     Ui::PreferencesDialog *ui;
     Profile *profile;
     QHash<int, QColor> m_new_colors;