From kde-commits Sat Dec 05 20:16:59 2009 From: Frank Osterfeld Date: Sat, 05 Dec 2009 20:16:59 +0000 To: kde-commits Subject: KDE/kdepim/akregator/src Message-Id: <1260044219.838946.14887.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=126004435708638 SVN commit 1059116 by osterfeld: merge from 4.3 branch ------------------------------------------------------------------------ r1012119 | osterfeld | 2009-08-16 22:50:36 +0200 (Sun, 16 Aug 2009) | 9 lines make the article pane a QFrame and give it a proper border Patch by Miroslav Los, milamby at yahoo.com His comment: "The ArticleViewer in Akregator's main tab does not have any borders. This makes the transition to its container look unclean and the splitter between it and the ArticleListView above it hard to make out and target with the mouse. My patch solves this by changing ArticleViewer's base class from QWidget to QFrame and setting its style to Qt::StyledPanel to match the GUI around it and Qt::Raised. I did not select Qt::Sunken because the ArticleView contains the scrollbars of its KHTML component, unlike the sunken ArticleListView next to it. A Qt::Sunken ArticleViewer would therefore break overall UI consistency." ------------------------------------------------------------------------ M +2 -1 articleviewer.cpp M +2 -2 articleviewer.h --- trunk/KDE/kdepim/akregator/src/articleviewer.cpp #1059115:1059116 @@ -76,7 +76,7 @@ namespace Akregator { ArticleViewer::ArticleViewer(QWidget *parent) - : QWidget(parent), + : QFrame(parent), m_url(0), m_htmlFooter(), m_currentText(), @@ -87,6 +87,7 @@ m_normalViewFormatter( new DefaultNormalViewFormatter( m_imageDir, m_part->view() ) ), m_combinedViewFormatter( new DefaultCombinedViewFormatter( m_imageDir, m_part->view() ) ) { + setFrameStyle(QFrame::StyledPanel | QFrame::Raised); QGridLayout* layout = new QGridLayout(this); layout->setMargin(0); layout->addWidget(m_part->widget(), 0, 0); --- trunk/KDE/kdepim/akregator/src/articleviewer.h #1059115:1059116 @@ -29,8 +29,8 @@ #include +#include #include -#include #include #include @@ -51,7 +51,7 @@ class ArticleViewerPart; -class ArticleViewer : public QWidget +class ArticleViewer : public QFrame { Q_OBJECT public: