[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-baseapps/KDE/4.10] plasma/applets/folderview: Use dialog svg instead of tooltip for folderview'
From:       Hrvoje Senjan <hrvoje.senjan () gmail ! com>
Date:       2013-06-03 15:24:21
Message-ID: 20130603152421.151ACA6067 () git ! kde ! org
[Download RAW message or body]

Git commit 66691b0528e953a5f55f0973a98470681dd32458 by Hrvoje Senjan.
Committed on 03/06/2013 at 17:18.
Pushed by hrvojes into branch 'KDE/4.10'.

Use dialog svg instead of tooltip for folderview's popupview

Fixes popup rendering when tooltip != dialog background
Also fixed compiler warning
REVIEW: 110786
CCBUG: 320265

M  +4    -2    plasma/applets/folderview/popupview.cpp
M  +1    -1    plasma/applets/folderview/popupview.h

http://commits.kde.org/kde-baseapps/66691b0528e953a5f55f0973a98470681dd32458

diff --git a/plasma/applets/folderview/popupview.cpp b/plasma/applets/folderview/popupview.cpp
index 75db43e..f78c016 100644
--- a/plasma/applets/folderview/popupview.cpp
+++ b/plasma/applets/folderview/popupview.cpp
@@ -112,7 +112,7 @@ PopupView::PopupView(const QModelIndex &index, const QPoint &pos,
     }
 
     m_background = new Plasma::FrameSvg(this);
-    m_background->setImagePath("widgets/tooltip");
+    m_background->setImagePath("dialogs/background");
 
     int left   = m_background->marginSize(Plasma::LeftMargin);
     int top    = m_background->marginSize(Plasma::TopMargin);
@@ -539,8 +539,10 @@ void PopupView::resizeEvent(QResizeEvent *event)
     }
 }
 
-void PopupView::showEvent(QShowEvent * event)
+void PopupView::showEvent(QShowEvent *event)
 {
+    Q_UNUSED(event)
+
     DialogShadows::self()->addWindow(this);
 }
 
diff --git a/plasma/applets/folderview/popupview.h b/plasma/applets/folderview/popupview.h
index e00e5ba..dc89ed9 100644
--- a/plasma/applets/folderview/popupview.h
+++ b/plasma/applets/folderview/popupview.h
@@ -60,7 +60,7 @@ public:
     static QTime lastOpenCloseTime() { return s_lastOpenClose; }
 
 protected:
-    void showEvent(QShowEvent * event);
+    void showEvent(QShowEvent *event);
     void paintEvent(QPaintEvent *event);
     void contextMenuEvent(QContextMenuEvent *event);
     void resizeEvent(QResizeEvent *event);
[prev in list] [next in list] [prev in thread] [next in thread]