projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move "Appearance" to "Interface" in settingspages
[quassel.git]
/
src
/
qtui
/
chatitem.h
diff --git
a/src/qtui/chatitem.h
b/src/qtui/chatitem.h
index
efd0705
..
9abd761
100644
(file)
--- a/
src/qtui/chatitem.h
+++ b/
src/qtui/chatitem.h
@@
-48,10
+48,11
@@
public:
void initLayoutHelper(QTextLayout *layout, QTextOption::WrapMode, Qt::Alignment = Qt::AlignLeft) const;
virtual inline void initLayout(QTextLayout *layout) const {
void initLayoutHelper(QTextLayout *layout, QTextOption::WrapMode, Qt::Alignment = Qt::AlignLeft) const;
virtual inline void initLayout(QTextLayout *layout) const {
- initLayoutHelper(layout, QTextOption::
WrapAnywhere
);
+ initLayoutHelper(layout, QTextOption::
NoWrap
);
doLayout(layout);
}
virtual void doLayout(QTextLayout *) const;
doLayout(layout);
}
virtual void doLayout(QTextLayout *) const;
+ virtual UiStyle::FormatList formatList() const;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
enum { Type = ChatScene::ChatItemType };
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
enum { Type = ChatScene::ChatItemType };
@@
-85,7
+86,8
@@
protected:
void paintBackground(QPainter *);
QVector<QTextLayout::FormatRange> selectionFormats() const;
void paintBackground(QPainter *);
QVector<QTextLayout::FormatRange> selectionFormats() const;
- virtual inline QVector<QTextLayout::FormatRange> additionalFormats() const { return QVector<QTextLayout::FormatRange>(); }
+ virtual QVector<QTextLayout::FormatRange> additionalFormats() const;
+ void overlayFormat(UiStyle::FormatList &fmtList, int start, int end, quint32 overlayFmt) const;
inline qint16 selectionStart() const { return _selectionStart; }
inline void setSelectionStart(qint16 start) { _selectionStart = start; }
inline qint16 selectionStart() const { return _selectionStart; }
inline void setSelectionStart(qint16 start) { _selectionStart = start; }
@@
-190,6
+192,7
@@
protected:
doLayout(layout);
}
virtual void doLayout(QTextLayout *layout) const;
doLayout(layout);
}
virtual void doLayout(QTextLayout *layout) const;
+ virtual UiStyle::FormatList formatList() const;
private:
struct Clickable;
private:
struct Clickable;
@@
-248,7
+251,7
@@
public:
WrapColumnFinder(const ChatItem *parent);
~WrapColumnFinder();
WrapColumnFinder(const ChatItem *parent);
~WrapColumnFinder();
- qint16 nextWrapColumn();
+ qint16 nextWrapColumn(
qreal width
);
private:
const ChatItem *item;
private:
const ChatItem *item;