Ensure playing item is always visible

Also consider https links

diff --git a/src/MediaView.cpp b/src/MediaView.cpp
index 66fc5ec1bcd681e7689651befa701a4250f4d807..d41c69eae29e8970cd34ec805be6f986b639d5cc 100644 (file)
--- a/src/MediaView.cpp
+++ b/src/MediaView.cpp
@@ -177,7 +177,7 @@ void MediaView::search(SearchParams *searchParams) {
 
     QString keyword = searchParams->keywords();
     QString display = keyword;
-    if (keyword.startsWith("http://")) {
+    if (keyword.startsWith("http://") || keyword.startsWith("https://")) {
         int separator = keyword.indexOf("|");
         if (separator > 0 && separator + 1 < keyword.length()) {
             display = keyword.mid(separator+1);
@@ -323,6 +323,13 @@ void MediaView::activeRowChanged(int row) {
 
     The::globalActions()->value("download")->setEnabled(DownloadManager::instance()->itemForVideo(video) == 0);
 
+    // ensure active item is visible
+    // int row = listModel->activeRow();
+    if (row != -1) {
+        QModelIndex index = listModel->index(row, 0, QModelIndex());
+        listView->scrollTo(index, QAbstractItemView::EnsureVisible);
+    }
+
     // see you in gotStreamUrl...
 
 }

diff --git a/src/SearchView.cpp b/src/SearchView.cpp
index bdb20e12f5a62b64f8fdc747ebe6373c7667b094..11f86d07fa848babebfd9aab1ee8f1f8a2567936 100644 (file)
--- a/src/SearchView.cpp
+++ b/src/SearchView.cpp
@@ -204,7 +204,7 @@ void SearchView::updateRecentKeywords() {
     foreach (QString keyword, keywords) {
         QString link = keyword;
         QString display = keyword;
-        if (keyword.startsWith("http://")) {
+        if (keyword.startsWith("http://") || keyword.startsWith("https://")) {
             int separator = keyword.indexOf("|");
             if (separator > 0 && separator + 1 < keyword.length()) {
                 link = keyword.left(separator);
@@ -244,7 +244,7 @@ void SearchView::updateRecentChannels() {
     foreach (QString keyword, keywords) {
         QString link = keyword;
         QString display = keyword;
-        if (keyword.startsWith("http://")) {
+        if (keyword.startsWith("http://") || keyword.startsWith("https://")) {
             int separator = keyword.indexOf("|");
             if (separator > 0 && separator + 1 < keyword.length()) {
                 link = keyword.left(separator);