* Fixed a lot of cross-merging, ** up the branches before

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index c390bdc7cf30ad9c50f6980fa078ae17b383d8c6..6ca90e2ed9aa4d6c1e89eb6342787f14b235cd67 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -82,8 +82,6 @@ MainWindow::MainWindow() :
             SLOT(updateDownloadMessage(QString)));
     connect(DownloadManager::instance(), SIGNAL(finished()),
             SLOT(downloadsFinished()));
-
-    this->setMouseTracking(true);
 }
 
 MainWindow::~MainWindow() {
@@ -937,6 +935,16 @@ void MainWindow::toggleDefinitionMode() {
     setDefinitionMode(nextDefinition);
 }
 
+void MainWindow::showFullscreenToolbar(bool show) {
+    if (!m_fullscreen) return;
+    mainToolBar->setVisible(show);
+}
+
+void MainWindow::showFullscreenPlaylist(bool show) {
+    if (!m_fullscreen) return;
+    mediaView->setPlaylistVisible(show);
+}
+
 void MainWindow::clearRecentKeywords() {
     QSettings settings;
     settings.remove("recentKeywords");

diff --git a/src/MainWindow.h b/src/MainWindow.h
index 34da611b0d4dd6dc9b7c4420c41df22ec57e6599..5034df8afb8dc1c18e249ddece89e6b26f054ccd 100644 (file)
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -54,6 +54,10 @@ private slots:
     void volumeChanged(qreal newVolume);
     void volumeMutedChanged(bool muted);
 
+    // fullscreen toolbar
+    void showFullscreenToolbar(bool show);
+    void showFullscreenPlaylist(bool show);
+
     // void setAutoplay(bool enabled);
     void updateDownloadMessage(QString);
     void downloadsFinished();

diff --git a/src/MediaView.cpp b/src/MediaView.cpp
index 48bb22dd0a601ce0d5326a10df64230efb99ae1c..0fd49b27ca97eebfd944133661b8357fe9a9ed6f 100644 (file)
--- a/src/MediaView.cpp
+++ b/src/MediaView.cpp
@@ -626,10 +626,6 @@ void MediaView::fullscreen() {
     videoAreaWidget->showFullScreen();
 }
 
-QSize MediaView::getPlaylistSize() {
-    return this->playlistWidget->size();
-}
-
 /*
 void MediaView::setSlider(QSlider *slider) {
     this->slider = slider;

diff --git a/src/MediaView.h b/src/MediaView.h
index d4784796c4f7c18d3b377b0f525fd2e3cd76af73..a4016bee1b60775b7535e081e1df22089095ff5b 100644 (file)
--- a/src/MediaView.h
+++ b/src/MediaView.h
@@ -42,7 +42,6 @@ public:
 
     void setMediaObject(Phonon::MediaObject *mediaObject);
     void setSlider(QSlider *slider);
-    QSize getPlaylistSize();
 
 public slots:
     void search(SearchParams *searchParams);

diff --git a/src/videoareawidget.cpp b/src/videoareawidget.cpp
index f4b48e6ecae75303d638cf5dafd44646abfe2a98..2b1c6d1f2dde423020875e4d404e82a2067bb5c7 100644 (file)
--- a/src/videoareawidget.cpp
+++ b/src/videoareawidget.cpp
@@ -107,11 +107,11 @@ void VideoAreaWidget::mouseMoveEvent(QMouseEvent *event) {
     const int x = event->pos().x();
     const int y = event->pos().y();
 
-    bool visible = y <= 0;
+    bool visible = y <= 10;
     bool ret = QMetaObject::invokeMethod(mainWindow, "showFullscreenToolbar", Qt::DirectConnection, Q_ARG(bool, visible));
     if (!ret) qDebug() << "showFullscreenToolbar invokeMethod failed";
 
-    visible = x <= 0;
+    visible = x <= 10;
     ret = QMetaObject::invokeMethod(mainWindow, "showFullscreenPlaylist", Qt::DirectConnection, Q_ARG(bool, visible));
     if (!ret) qDebug() << "showFullscreenPlaylist invokeMethod failed";
 }