projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0c4d5e3
)
Don't scroll if a mouse button is pressed
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Mon, 3 Nov 2008 22:37:32 +0000
(23:37 +0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Mon, 3 Nov 2008 22:40:06 +0000
(23:40 +0100)
src/qtui/chatview.cpp
patch
|
blob
|
history
diff --git
a/src/qtui/chatview.cpp
b/src/qtui/chatview.cpp
index
ed71dd0
..
fd31645
100644
(file)
--- a/
src/qtui/chatview.cpp
+++ b/
src/qtui/chatview.cpp
@@
-18,6
+18,7
@@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <QApplication>
#include <QGraphicsTextItem>
#include <QScrollBar>
#include <QGraphicsTextItem>
#include <QScrollBar>
@@
-55,7
+56,7
@@
void ChatView::init(MessageFilter *filter) {
// setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);
setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
// setTransformationAnchor(QGraphicsView::NoAnchor);
// setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);
setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
// setTransformationAnchor(QGraphicsView::NoAnchor);
- setTransformationAnchor(QGraphicsView::AnchorViewCenter);
+ setTransformationAnchor(QGraphicsView::AnchorViewCenter);
_scene = new ChatScene(filter, filter->idString(), viewport()->width() - 2, this); // see below: resizeEvent()
connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(sceneRectChanged(const QRectF &)));
_scene = new ChatScene(filter, filter->idString(), viewport()->width() - 2, this); // see below: resizeEvent()
connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(sceneRectChanged(const QRectF &)));
@@
-84,7
+85,8
@@
void ChatView::lastLineChanged(QGraphicsItem *chatLine, qreal offset) {
Q_UNUSED(chatLine)
QAbstractSlider *vbar = verticalScrollBar();
Q_ASSERT(vbar);
Q_UNUSED(chatLine)
QAbstractSlider *vbar = verticalScrollBar();
Q_ASSERT(vbar);
- if(vbar->maximum() - vbar->value() <= (offset + 5) * _currentScaleFactor ) { // 5px grace area
+ if(QApplication::mouseButtons() == Qt::NoButton
+ && vbar->maximum() - vbar->value() <= (offset + 5) * _currentScaleFactor ) { // 5px grace area
vbar->setValue(vbar->maximum());
}
}
vbar->setValue(vbar->maximum());
}
}
@@
-117,7
+119,7
@@
MsgId ChatView::lastMsgId() const {
return model->data(model->index(model->rowCount() - 1, 0), MessageModel::MsgIdRole).value<MsgId>();
}
return model->data(model->index(model->rowCount() - 1, 0), MessageModel::MsgIdRole).value<MsgId>();
}
-void ChatView::zoomIn() {
+void ChatView::zoomIn() {
_currentScaleFactor *= 1.2;
scale(1.2, 1.2);
scene()->setWidth(viewport()->width() / _currentScaleFactor - 2);
_currentScaleFactor *= 1.2;
scale(1.2, 1.2);
scene()->setWidth(viewport()->width() / _currentScaleFactor - 2);