projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor and simplify ChatItem, implement full selection, use qreal where appropriate
[quassel.git]
/
src
/
qtui
/
chatitem.h
diff --git
a/src/qtui/chatitem.h
b/src/qtui/chatitem.h
index
a00e1e6
..
3cf5a9b
100644
(file)
--- a/
src/qtui/chatitem.h
+++ b/
src/qtui/chatitem.h
@@
-22,9
+22,11
@@
#define CHATITEM_H_
#include <QGraphicsItem>
#define CHATITEM_H_
#include <QGraphicsItem>
+#include <QObject>
#include "chatline.h"
#include "chatlinemodel.h"
#include "chatline.h"
#include "chatlinemodel.h"
+#include "chatscene.h"
#include "uistyle.h"
class QTextLayout;
#include "uistyle.h"
class QTextLayout;
@@
-38,6
+40,7
@@
class ChatItem : public QGraphicsItem {
inline QPersistentModelIndex index() const { return _index; }
inline const MessageModel *model() const { return _index.isValid() ? qobject_cast<const MessageModel *>(_index.model()) : 0; }
inline int row() const { return _index.isValid() ? _index.row() : 0; }
inline QPersistentModelIndex index() const { return _index; }
inline const MessageModel *model() const { return _index.isValid() ? qobject_cast<const MessageModel *>(_index.model()) : 0; }
inline int row() const { return _index.isValid() ? _index.row() : 0; }
+ inline ChatScene *chatScene() const { return qobject_cast<ChatScene *>(scene()); }
inline QFontMetricsF *fontMetrics() const { return _fontMetrics; }
inline virtual QRectF boundingRect() const { return _boundingRect; }
inline QFontMetricsF *fontMetrics() const { return _fontMetrics; }
inline virtual QRectF boundingRect() const { return _boundingRect; }
@@
-52,23
+55,38
@@
class ChatItem : public QGraphicsItem {
virtual QVariant data(int role) const;
// returns height
virtual QVariant data(int role) const;
// returns height
- int setWidth(int width);
+ qreal setWidth(qreal width);
+
+ // selection stuff, to be called by the scene
+ void clearSelection();
+ void setFullSelection();
+ void continueSelecting();
protected:
protected:
- //void mouseMoveEvent ( QGraphicsSceneMouseEvent * event );
+ virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+ virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+ virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
private:
private:
- int heightForWidth(int width);
- QTextLayout *createLayout(QTextOption::WrapMode);
+ qint16 posToCursor(const QPointF &pos);
+ qreal computeHeight();
+ QTextLayout *createLayout(QTextOption::WrapMode, Qt::Alignment = Qt::AlignLeft);
+
+ // internal selection stuff
+ void setSelection(int start, int length);
QRectF _boundingRect;
QFontMetricsF *_fontMetrics;
quint8 _lines;
QPersistentModelIndex _index;
QRectF _boundingRect;
QFontMetricsF *_fontMetrics;
quint8 _lines;
QPersistentModelIndex _index;
- QTextLayout *_layout;
+ QTextLayout *
_layout;
QList<quint16> _wrapPositions;
QList<quint16> _wrapPositions;
+ enum SelectionMode { NoSelection, PartialSelection, FullSelection };
+ SelectionMode _selectionMode;
+ qint16 _selectionStart, _selectionEnd;
+
class WrapColumnFinder;
};
class WrapColumnFinder;
};
@@
-77,15
+95,15
@@
class ChatItem::WrapColumnFinder {
WrapColumnFinder(ChatItem *parent);
~WrapColumnFinder();
WrapColumnFinder(ChatItem *parent);
~WrapColumnFinder();
-
int
nextWrapColumn();
+
qint16
nextWrapColumn();
private:
ChatItem *item;
QTextLayout *layout;
QTextLine line;
ChatLineModel::WrapList wrapList;
private:
ChatItem *item;
QTextLayout *layout;
QTextLine line;
ChatLineModel::WrapList wrapList;
-
int
wordidx;
-
int
lastwrapcol;
+
qint16
wordidx;
+
qint16
lastwrapcol;
qreal lastwrappos;
qreal w;
};
qreal lastwrappos;
qreal w;
};