projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
identd: Implement --ident-port option
[quassel.git]
/
src
/
uisupport
/
bufferview.cpp
diff --git
a/src/uisupport/bufferview.cpp
b/src/uisupport/bufferview.cpp
index
7d7490f
..
8387f02
100644
(file)
--- a/
src/uisupport/bufferview.cpp
+++ b/
src/uisupport/bufferview.cpp
@@
-501,6
+501,8
@@
void BufferView::changeBuffer(Direction direction)
QModelIndex currentIndex = selectionModel()->currentIndex();
QModelIndex resultingIndex;
QModelIndex currentIndex = selectionModel()->currentIndex();
QModelIndex resultingIndex;
+ QModelIndex lastNetIndex = model()->index(model()->rowCount() - 1, 0, QModelIndex());
+
if (currentIndex.parent().isValid()) {
//If we are a child node just switch among siblings unless it's the first/last child
resultingIndex = currentIndex.sibling(currentIndex.row() + direction, 0);
if (currentIndex.parent().isValid()) {
//If we are a child node just switch among siblings unless it's the first/last child
resultingIndex = currentIndex.sibling(currentIndex.row() + direction, 0);
@@
-517,6
+519,8
@@
void BufferView::changeBuffer(Direction direction)
//If we have a toplevel node, try and get an adjacent child
if (direction == Backward) {
QModelIndex newParent = currentIndex.sibling(currentIndex.row() - 1, 0);
//If we have a toplevel node, try and get an adjacent child
if (direction == Backward) {
QModelIndex newParent = currentIndex.sibling(currentIndex.row() - 1, 0);
+ if (currentIndex.row() == 0)
+ newParent = lastNetIndex;
if (model()->hasChildren(newParent))
resultingIndex = newParent.child(model()->rowCount(newParent) - 1, 0);
else
if (model()->hasChildren(newParent))
resultingIndex = newParent.child(model()->rowCount(newParent) - 1, 0);
else
@@
-530,8
+534,12
@@
void BufferView::changeBuffer(Direction direction)
}
}
}
}
- if (!resultingIndex.isValid())
- return;
+ if (!resultingIndex.isValid()) {
+ if (direction == Forward)
+ resultingIndex = model()->index(0, 0, QModelIndex());
+ else
+ resultingIndex = lastNetIndex.child(model()->rowCount(lastNetIndex) - 1, 0);
+ }
selectionModel()->setCurrentIndex(resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
selectionModel()->select(resultingIndex, QItemSelectionModel::ClearAndSelect);
selectionModel()->setCurrentIndex(resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
selectionModel()->select(resultingIndex, QItemSelectionModel::ClearAndSelect);