projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change Hilight config dialog layout a bit
[quassel.git]
/
src
/
qtui
/
chatview.cpp
diff --git
a/src/qtui/chatview.cpp
b/src/qtui/chatview.cpp
index
e61dc9e
..
cc5009b
100644
(file)
--- a/
src/qtui/chatview.cpp
+++ b/
src/qtui/chatview.cpp
@@
-55,8
+55,6
@@
void ChatView::init(MessageFilter *filter) {
_bufferContainer = 0;
_currentScaleFactor = 1;
_invalidateFilter = false;
_bufferContainer = 0;
_currentScaleFactor = 1;
_invalidateFilter = false;
- _markerLineVisible = true;
- _markedLine = 0;
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
@@
-243,7
+241,7
@@
QList<ChatLine *> ChatView::visibleChatLinesSorted(Qt::ItemSelectionMode mode) c
return result;
}
return result;
}
-ChatLine *ChatView::lastVisibleChatLine() const {
+ChatLine *ChatView::lastVisibleChatLine(
bool ignoreDayChange
) const {
if(!scene())
return 0;
if(!scene())
return 0;
@@
-255,7
+253,7
@@
ChatLine *ChatView::lastVisibleChatLine() const {
QSet<ChatLine *> visibleLines = visibleChatLines(Qt::ContainsItemBoundingRect);
foreach(ChatLine *line, visibleLines) {
QSet<ChatLine *> visibleLines = visibleChatLines(Qt::ContainsItemBoundingRect);
foreach(ChatLine *line, visibleLines) {
- if(line->row() > row)
+ if(line->row() > row
&& (ignoreDayChange? line->msgType() != Message::DayChange : true)
)
row = line->row();
}
row = line->row();
}
@@
-266,42
+264,27
@@
ChatLine *ChatView::lastVisibleChatLine() const {
}
void ChatView::setMarkerLineVisible(bool visible) {
}
void ChatView::setMarkerLineVisible(bool visible) {
- if(visible != _markerLineVisible) {
- _markerLineVisible = visible;
- }
+ scene()->setMarkerLineVisible(visible);
}
}
-void ChatView::setMarkedLine(ChatLine *line) {
- if(_markedLine == line)
- return;
-
+void ChatView::setMarkerLine(MsgId msgId) {
if(!scene()->isSingleBufferScene())
return;
if(!scene()->isSingleBufferScene())
return;
- if(line) {
- BufferId bufId = scene()->singleBufferId();
- Client::setMarkerLine(bufId, line->msgId());
- }
+ BufferId bufId = scene()->singleBufferId();
+ Client::setMarkerLine(bufId, msgId);
}
}
-void ChatView::markerLineSet(BufferId buffer, MsgId msg) {
+void ChatView::markerLineSet(BufferId buffer, MsgId msg
Id
) {
if(!scene()->isSingleBufferScene() || scene()->singleBufferId() != buffer)
return;
if(!scene()->isSingleBufferScene() || scene()->singleBufferId() != buffer)
return;
- ChatLine *newLine = scene()->chatLine(msg);
- if(_markedLine == newLine)
- return;
-
- ChatLine *oldLine = _markedLine;
- _markedLine = newLine;
-
- if(oldLine)
- oldLine->update();
+ scene()->setMarkerLine(msgId);
+ scene()->setMarkerLineVisible(true);
+}
- if(newLine) {
- setMarkerLineVisible(true);
- newLine->update();
- }
+void ChatView::jumpToMarkerLine(bool requestBacklog) {
+ scene()->jumpToMarkerLine(requestBacklog);
}
void ChatView::addActionsToMenu(QMenu *menu, const QPointF &pos) {
}
void ChatView::addActionsToMenu(QMenu *menu, const QPointF &pos) {