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

List:       kde-commits
Subject:    branches/KDE/4.5/kdebase/workspace/plasma/generic/applets/webbrowser
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-12-13 9:30:48
Message-ID: 20101213093048.4F966AC8A8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1206067 by mart:

backport fix for the border



 M  +26 -18    webbrowser.cpp  
 M  +0 -1      webbrowser.h  


--- branches/KDE/4.5/kdebase/workspace/plasma/generic/applets/webbrowser/webbrowser.cpp \
#1206066:1206067 @@ -62,6 +62,26 @@
 
 using Plasma::MessageButton;
 
+class BrowserBorder: public QGraphicsWidget
+{
+public:
+    BrowserBorder(QGraphicsItem *parent)
+        : QGraphicsWidget(parent)
+    {}
+
+    void paint(QPainter *painter,
+               const QStyleOptionGraphicsItem *option,
+               QWidget *widget)
+    {
+        painter->save();
+        painter->setBrush(QApplication::palette().window());
+        painter->setRenderHint(QPainter::Antialiasing);
+        painter->setPen(Qt::NoPen);
+        painter->drawRoundedRect(boundingRect(), 2, 2);
+        painter->restore();
+    }
+};
+
 WebBrowser::WebBrowser(QObject *parent, const QVariantList &args)
         : Plasma::PopupApplet(parent, args),
           m_browser(0),
@@ -123,8 +143,13 @@
 
     m_browser->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
-    m_layout->addItem(m_browser);
+    //luckily this horror will easily die with qml
+    BrowserBorder *border = new BrowserBorder(this);
+    QGraphicsLinearLayout *borderLayout = new QGraphicsLinearLayout(border);
+    borderLayout->addItem(m_browser);
 
+    m_layout->addItem(border);
+
     //bookmarks
     m_bookmarkManager = KBookmarkManager::userBookmarksManager();
     connect(m_bookmarkManager, SIGNAL(changed(const QString, const QString)), this, \
SLOT(bookmarksModelInit())); @@ -591,23 +616,6 @@
     }
 }
 
-void WebBrowser::paintInterface(QPainter *p, const QStyleOptionGraphicsItem *option, \
                const QRect &contentsRect)
-{
-    Q_UNUSED(option)
-    Q_UNUSED(contentsRect)
-  
-    p->save();
-    p->setBrush(QApplication::palette().window());
-    p->setRenderHint(QPainter::Antialiasing);
-    p->setPen(Qt::NoPen);
-    p->drawRoundedRect(m_browser->pos().x() + contentsRect.x() - 2,
-                       m_browser->pos().y() + contentsRect.y() - 2,
-                       m_browser->geometry().width() + 4,
-                       m_browser->geometry().height() + 4,
-                       2, 2);
-    p->restore();
-}
-
 void WebBrowser::closeWebViewOverlay()
 {
     if (m_webOverlay){
--- branches/KDE/4.5/kdebase/workspace/plasma/generic/applets/webbrowser/webbrowser.h \
#1206066:1206067 @@ -67,7 +67,6 @@
     ~WebBrowser();
 
     QGraphicsWidget *graphicsWidget();
-    void paintInterface(QPainter *p, const QStyleOptionGraphicsItem *option, const \
QRect &contentsRect);  QWebPage *createWindow(QWebPage::WebWindowType type);
     
     //TODO: put in a separate file


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