From a2f4d471cc13e524c16dcd5a6bf1b13c49703a2f Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 17 Feb 2014 20:32:45 +0100 Subject: [PATCH] Some work... --- src/gui/messagesview.cpp | 9 +++++++++ src/gui/messagesview.h | 4 ++-- src/gui/webview.cpp | 21 --------------------- src/gui/webview.h | 3 --- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp index 7bd65c522..a60b3a24a 100644 --- a/src/gui/messagesview.cpp +++ b/src/gui/messagesview.cpp @@ -195,6 +195,15 @@ void MessagesView::currentChanged(const QModelIndex ¤t, QTreeView::currentChanged(current, previous); } +void MessagesView::selectionChanged(const QItemSelection &selected, + const QItemSelection &deselected) { + // TODO: This fixes bug #13 + possibly + // move code from currentChanged to this method too. + scrollTo(currentIndex(), QAbstractItemView::PositionAtCenter); + + QTreeView::selectionChanged(selected, deselected); +} + void MessagesView::loadFeeds(const QList &feed_ids) { // Load messages. diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h index f878ee436..9633a8901 100755 --- a/src/gui/messagesview.h +++ b/src/gui/messagesview.h @@ -77,8 +77,8 @@ class MessagesView : public QTreeView { void contextMenuEvent(QContextMenuEvent *event); void mousePressEvent(QMouseEvent *event); void keyPressEvent(QKeyEvent *event); - void currentChanged(const QModelIndex ¤t, - const QModelIndex &previous); + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous); + void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); signals: // Link/message openers. diff --git a/src/gui/webview.cpp b/src/gui/webview.cpp index 7c85bd3e4..973deb823 100644 --- a/src/gui/webview.cpp +++ b/src/gui/webview.cpp @@ -256,27 +256,6 @@ void WebView::wheelEvent(QWheelEvent *event) { QWebView::wheelEvent(event); } -void WebView::paintEvent(QPaintEvent *event) { - QWebView::paintEvent(event); - - // Draw additional frame. - /* - QPainter painter(this); - QStyleOptionFrameV3 style_option; - int frame_shape = QFrame::Sunken & QFrame::Shape_Mask; - - style_option.init(this); - style_option.frameShape = QFrame::Shape(int(style_option.frameShape) | - QFrame::StyledPanel | - frame_shape); - style_option.rect = rect(); - style_option.lineWidth = 1; - style_option.midLineWidth = 0; - - style()->drawControl(QStyle::CE_ShapedFrame, &style_option, &painter, this); - */ -} - bool WebView::increaseWebPageZoom() { qreal new_factor = zoomFactor() + 0.1; diff --git a/src/gui/webview.h b/src/gui/webview.h index 2f8256615..d8f167ab1 100644 --- a/src/gui/webview.h +++ b/src/gui/webview.h @@ -63,9 +63,6 @@ class WebView : public QWebView { // Customize mouse wheeling. void wheelEvent(QWheelEvent *event); - // Does additional painting. - void paintEvent(QPaintEvent *event); - // Provides custom mouse actions. void mousePressEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event);