mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-28 00:42:19 -07:00
Fix rebase mistake.
This commit is contained in:
parent
c4c8484e76
commit
e43393f299
1 changed files with 15 additions and 15 deletions
|
|
@ -730,7 +730,7 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor,
|
||||||
connect(userTree->verticalScrollBar(), &QScrollBar::valueChanged, this, [this] {
|
connect(userTree->verticalScrollBar(), &QScrollBar::valueChanged, this, [this] {
|
||||||
showPopupTimer->stop();
|
showPopupTimer->stop();
|
||||||
hidePopup(true);
|
hidePopup(true);
|
||||||
requestAvatarsForVisibleItems();
|
requestVisibleItemResources();
|
||||||
});
|
});
|
||||||
|
|
||||||
// Forward join requests from popup upward
|
// Forward join requests from popup upward
|
||||||
|
|
@ -746,7 +746,7 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor,
|
||||||
|
|
||||||
// Keep the popup-less scroll path alive for avatar prefetch.
|
// Keep the popup-less scroll path alive for avatar prefetch.
|
||||||
connect(userTree->verticalScrollBar(), &QScrollBar::valueChanged, this,
|
connect(userTree->verticalScrollBar(), &QScrollBar::valueChanged, this,
|
||||||
[this] { requestAvatarsForVisibleItems(); });
|
[this] { requestVisibleItemResources(); });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Section dividers can be collapsed/expanded by the user. Surface those
|
// Section dividers can be collapsed/expanded by the user. Surface those
|
||||||
|
|
@ -1541,9 +1541,9 @@ void UserListWidget::updateCount()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void UserListWidget::setShowTitle(bool showTitle)
|
void UserListWidget::setShowTitle(bool _showTitle)
|
||||||
{
|
{
|
||||||
this->showTitle = showTitle;
|
this->showTitle = _showTitle;
|
||||||
updateCount();
|
updateCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue