Minor Yosemite fixes

diff --git a/CHANGES b/CHANGES
index 923ccbea45437949592e94d8a771bd847aff75c7..e135e4c5ec5665191c5bf905b52c3707a12ea5a9 100644 (file)
--- 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 1fab51c285ccdcfbcee1b2f84a88197c0a4c599a..382d91a97923a50e11ea41f011718fb7c5243edf 100644 (file)
--- 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 42707d477aa15a1ad919e43c75a16a6e53211cfe..2e3ac2769a846007bee9ff583a42927c1b2ef8ab 100644 (file)
--- 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() {