From: Flavio <flavio.tordini@gmail.com>
Date: Tue, 21 Oct 2014 15:37:01 +0000 (+0200)
Subject: Minor Yosemite fixes
X-Git-Tag: 2.3~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6670ba1908780dd31492e266fcfb3221953ced87;hp=88c218738b131208e6ae1602ce1fc0a24c5962a8;p=minitube

Minor Yosemite fixes
---

diff --git a/CHANGES b/CHANGES
index 923ccbe..e135e4c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,10 +5,11 @@
 - Slide transition in playlist navigation
 - Make the volume handle red when volume is zero
 - Enhancements to the search suggestions
-- Restored compatibility with Mac OS X Snow Leopard
 - The Mac version is now 64bit and uses the VLC engine to play videos
+- Fixed minor style issues with Mac OS X Yosemite 10.10
+- Restored compatibility with Mac OS X Snow Leopard 10.6
 - The Windows version has been updated to the latest VLC
-- The Ubuntu version is now shipped as a .deb  on the site. Goodbye Ubuntu Software Center!
+- The Ubuntu & Debian version is now shipped as a .deb on the site. Goodbye Ubuntu Software Center!
 - New and updated translations
 
 2.2
diff --git a/src/main.cpp b/src/main.cpp
index 1fab51c..382d91a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -38,8 +38,7 @@ int main(int argc, char **argv) {
 
 #ifdef Q_OS_MAC
     mac::MacMain();
-    // https://bugreports.qt-project.org/browse/QTBUG-32789
-    QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");
+    QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Helvetica Neue");
 #endif
 
     QtSingleApplication app(argc, argv);
@@ -54,9 +53,6 @@ int main(int argc, char **argv) {
     app.setApplicationName(QLatin1String(Constants::NAME));
     app.setOrganizationName(QLatin1String(Constants::ORG_NAME));
     app.setOrganizationDomain(QLatin1String(Constants::ORG_DOMAIN));
-#ifndef APP_WIN
-    app.setWheelScrollLines(1);
-#endif
     app.setAttribute(Qt::AA_DontShowIconsInMenus);
 
 #ifdef APP_EXTRA
diff --git a/src/searchview.cpp b/src/searchview.cpp
index 42707d4..2e3ac27 100644
--- a/src/searchview.cpp
+++ b/src/searchview.cpp
@@ -133,7 +133,9 @@ SearchView::SearchView(QWidget *parent) : QWidget(parent) {
     searchLayout->setAlignment(Qt::AlignVCenter);
 
     queryEdit = new SearchLineEdit(this);
+#ifndef APP_MAC
     queryEdit->setFont(biggerFont);
+#endif
     connect(queryEdit, SIGNAL(search(const QString&)), SLOT(watch(const QString&)));
     connect(queryEdit, SIGNAL(textEdited(const QString &)), SLOT(textChanged(const QString &)));
     connect(queryEdit, SIGNAL(suggestionAccepted(Suggestion*)), SLOT(suggestionAccepted(Suggestion*)));
@@ -200,7 +202,8 @@ void SearchView::appear() {
     updateRecentChannels();
     queryEdit->selectAll();
     queryEdit->enableSuggest();
-    QTimer::singleShot(0, queryEdit, SLOT(setFocus()));
+    if (!queryEdit->hasFocus())
+        QTimer::singleShot(10, queryEdit, SLOT(setFocus()));
 }
 
 void SearchView::updateRecentKeywords() {