StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Fix sorting and cycling bugs for circles

Browse Source
This commit is contained in:
TheSpiritXIII 2015-06-05 13:54:55 -04:00 committed by tux3
parent 0d4ca979bc
commit 38fa6fc291
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widget/circlewidget.cpp
View File

@ -179,8 +179,10 @@ void emitChatroomWidget(QLayout* layout, int index)
bool CircleWidget::cycleContacts(bool forward) bool CircleWidget::cycleContacts(bool forward)
{ {
qDebug() << "Cycling on contact: " << getName();
if (listLayout->friendTotalCount() == 0) if (listLayout->friendTotalCount() == 0)
{ {
qDebug() << "Empty";
return false; return false;
} }
if (forward) if (forward)
@ -189,12 +191,14 @@ bool CircleWidget::cycleContacts(bool forward)
{ {
expand(); expand();
emitChatroomWidget(listLayout->getLayoutOnline(), 0); emitChatroomWidget(listLayout->getLayoutOnline(), 0);
qDebug() << "emmited 1";
return true; return true;
} }
else if (listLayout->getLayoutOffline()->count() != 0) else if (listLayout->getLayoutOffline()->count() != 0)
{ {
expand(); expand();
emitChatroomWidget(listLayout->getLayoutOffline(), 0); emitChatroomWidget(listLayout->getLayoutOffline(), 0);
qDebug() << "emmited 2";
return true; return true;
} }
} }
@ -204,12 +208,14 @@ bool CircleWidget::cycleContacts(bool forward)
{ {
expand(); expand();
emitChatroomWidget(listLayout->getLayoutOffline(), listLayout->getLayoutOffline()->count() - 1); emitChatroomWidget(listLayout->getLayoutOffline(), listLayout->getLayoutOffline()->count() - 1);
qDebug() << "emmited 3";
return true; return true;
} }
else if (listLayout->getLayoutOnline()->count() != 0) else if (listLayout->getLayoutOnline()->count() != 0)
{ {
expand(); expand();
emitChatroomWidget(listLayout->getLayoutOnline(), listLayout->getLayoutOnline()->count() - 1); emitChatroomWidget(listLayout->getLayoutOnline(), listLayout->getLayoutOnline()->count() - 1);
qDebug() << "emmited 4";
return true; return true;
} }
} }

4
src/widget/friendlistwidget.cpp
View File

@ -168,10 +168,6 @@ void FriendListWidget::cycleContacts(GenericChatroomWidget* activeChatroomWidget
circleWidget = CircleWidget::getFromID(Settings::getInstance().getFriendCircleIndex(FriendList::findFriend(friendWidget->friendId)->getToxId())); circleWidget = CircleWidget::getFromID(Settings::getInstance().getFriendCircleIndex(FriendList::findFriend(friendWidget->friendId)->getToxId()));
if (circleWidget != nullptr) if (circleWidget != nullptr)
{ {
if (friendWidget == nullptr)
{
return;
}
if (circleWidget->cycleContacts(friendWidget, forward)) if (circleWidget->cycleContacts(friendWidget, forward))
return; return;

9
src/widget/genericchatitemlayout.cpp
View File

@ -102,7 +102,14 @@ int GenericChatItemLayout::indexOfClosestSortedWidget(GenericChatItemWidget* wid
GenericChatItemWidget* atMid = dynamic_cast<GenericChatItemWidget*>(layout->itemAt(mid)->widget()); GenericChatItemWidget* atMid = dynamic_cast<GenericChatItemWidget*>(layout->itemAt(mid)->widget());
assert(atMid != nullptr); assert(atMid != nullptr);
if (atMid->getName().localeAwareCompare(widget->getName()) < 0) bool lessThan = false;
int compareValue = atMid->getName().localeAwareCompare(widget->getName());
if (compareValue < 0)
lessThan = true;
else if (compareValue == 0)
lessThan = atMid < widget; // Consistent ordering.
if (lessThan)
min = mid + 1; min = mid + 1;
else else
max = mid; max = mid;