projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to make the QTBUG-6322 workaround work in more cases
[quassel.git]
/
src
/
qtui
/
chatview.h
diff --git
a/src/qtui/chatview.h
b/src/qtui/chatview.h
index
6f385bb
..
4e88d95
100644
(file)
--- a/
src/qtui/chatview.h
+++ b/
src/qtui/chatview.h
@@
-61,14
+61,14
@@
protected:
virtual void resizeEvent(QResizeEvent *event);
protected slots:
virtual void resizeEvent(QResizeEvent *event);
protected slots:
- virtual inline void sceneRectChanged(const QRectF &rect) { setSceneRect(rect); }
virtual void verticalScrollbarChanged(int);
private slots:
void lastLineChanged(QGraphicsItem *chatLine, qreal offset);
virtual void verticalScrollbarChanged(int);
private slots:
void lastLineChanged(QGraphicsItem *chatLine, qreal offset);
+ void adjustSceneRect();
void mouseMoveWhileSelecting(const QPointF &scenePos);
void scrollTimerTimeout();
void mouseMoveWhileSelecting(const QPointF &scenePos);
void scrollTimerTimeout();
- void
styleChanged
();
+ void
invalidateFilter
();
private:
void init(MessageFilter *filter);
private:
void init(MessageFilter *filter);
@@
-79,6
+79,11
@@
private:
qreal _currentScaleFactor;
QTimer _scrollTimer;
int _scrollOffset;
qreal _currentScaleFactor;
QTimer _scrollTimer;
int _scrollOffset;
+ bool _invalidateFilter;
+
+ // workaround for QTBUG-6322
+ qreal _verticalOffset;
+ bool _verticalOffsetStable;
};
};