projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial Channel specific highlights feature implementation
[quassel.git]
/
src
/
qtui
/
chatscene.cpp
diff --git
a/src/qtui/chatscene.cpp
b/src/qtui/chatscene.cpp
index
e5537a0
..
797b008
100644
(file)
--- a/
src/qtui/chatscene.cpp
+++ b/
src/qtui/chatscene.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
0
by the Quassel Project *
+ * Copyright (C) 2005-201
2
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-24,6
+24,7
@@
#include <QGraphicsSceneMouseEvent>
#include <QMenu>
#include <QMenuBar>
#include <QGraphicsSceneMouseEvent>
#include <QMenu>
#include <QMenuBar>
+#include <QMimeData>
#include <QPersistentModelIndex>
#ifdef HAVE_KDE
#include <QPersistentModelIndex>
#ifdef HAVE_KDE
@@
-429,7
+430,6
@@
void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
bool atTop = (start == 0);
bool atBottom = (end == _lines.count() - 1);
bool atTop = (start == 0);
bool atBottom = (end == _lines.count() - 1);
- bool moveTop = false;
// clear selection
if(_selectingItem) {
// clear selection
if(_selectingItem) {
@@
-459,7
+459,7
@@
void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
if(_selectionStart >= 0) {
int offset = end - start + 1;
if(_selectionStart >= start)
if(_selectionStart >= 0) {
int offset = end - start + 1;
if(_selectionStart >= start)
- _selectionStart = qMax(_selectionStart -
=
offset, start);
+ _selectionStart = qMax(_selectionStart - offset, start);
if(_selectionEnd >= start)
_selectionEnd -= offset;
if(_firstSelectionRow >= start)
if(_selectionEnd >= start)
_selectionEnd -= offset;
if(_firstSelectionRow >= start)
@@
-478,7
+478,6
@@
void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
int moveEnd = _lines.count() - 1;
if(start < _lines.count() - start) {
// move top part
int moveEnd = _lines.count() - 1;
if(start < _lines.count() - start) {
// move top part
- moveTop = true;
moveEnd = start - 1;
} else {
// move bottom part
moveEnd = start - 1;
} else {
// move bottom part