jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-29 09:22:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Client] Pin user list header length to the viewport width

Browse source 
The header stretch mode kept a resize section property, so after any
column grew past the viewport the list carried an invisible horizontal
pan range that scrolled rows sideways without visual feedback

Drop the leftover property so displayed length always equals viewport
width and horizontal panning is impossible
This commit is contained in:
Lukas Brübach 2026-08-22 00:11:59 +02:00
parent 5ba543f333
commit 9196a01e8f
1 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
View file

@ -613,9 +613,12 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor,
userTree->hideColumn(3);
connect(userTree, &QTreeWidget::itemActivated, this, &UserListWidget::userClicked);
userTree->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
userTree->header()->setStretchLastSection(true);
// No stretchLastSection: column 0 is the only visible section and is
// stretched explicitly in applyDisplayMode(). Stretching the (hidden)
// last section on top of that can leave a stale horizontal scroll range,
// which pans rows sideways with no visible scrollbar.
// Always create timers so callers never segfault on a null deref;
// Always create timers so callers never segfault on a null deref,
// showPopupForUser / hidePopup already guard against a null userInfoPopup.
showPopupTimer = new QTimer(this);
showPopupTimer->setSingleShot(true);
@ -736,7 +739,7 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor,
emit currentUserChanged(userName);
});
// 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,
[this] { requestAvatarsForVisibleItems(); });
}
@ -922,15 +925,24 @@ void UserListWidget::applyDisplayMode()
{
const bool styled = SettingsCache::instance().appearance().getStyleUserList();
// Both modes must keep the header length at the viewport width: with
// ScrollBarAlwaysOff a nonzero horizontal range is invisible but still
// pans via trackpad gestures, which reads as janky random drift.
if (styled) {
userTree->header()->setSectionResizeMode(0, QHeaderView::Stretch);
userTree->hideColumn(1);
userTree->hideColumn(2);
userTree->hideColumn(3);
} else {
userTree->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
userTree->showColumn(1);
userTree->showColumn(2);
// Bounded widths instead of ResizeToContents: content sizing measures
// the FULL text width while the delegate elides afterwards, so long
// names widened the header past the viewport. Fixed icon columns plus
// a stretched name column keep the range at zero, eliding trims.
userTree->header()->setSectionResizeMode(0, QHeaderView::Fixed);
userTree->header()->resizeSection(0, 24);
userTree->header()->setSectionResizeMode(1, QHeaderView::Fixed);
userTree->header()->resizeSection(1, 22);
userTree->header()->setSectionResizeMode(2, QHeaderView::Stretch);
userTree->hideColumn(3);
}
@ -978,7 +990,7 @@ void UserListWidget::connectPopupSignals()
bool UserListWidget::eventFilter(QObject *obj, QEvent *event)
{
// A press outside the tree, the popup and any open menu deselects the
// list and closes the popup. The filter is installed application-wide, so
// list and closes the popup. The filter is installed application wide, so
// the target can be any widget in the window or another list.
if (event->type() == QEvent::MouseButtonPress) {
auto *pressTarget = qobject_cast<QWidget *>(obj);
@ -988,10 +1000,10 @@ bool UserListWidget::eventFilter(QObject *obj, QEvent *event)
}
// Keyboard entry to the user context menu: the Menu key (or Shift+F10)
// pops the same menu the right-click shows, anchored to the focused row.
// Divider rows have no menu. Mouse-triggered context events are NOT handled
// here — the delegate's right-press path already pops the menu, and
// handling both would open two menus on one right-click.
// pops the same menu the right click shows, anchored to the focused row.
// Divider rows have no menu. Mouse triggered context events are NOT handled
// here, the delegate's right press path already pops the menu, and
// handling both would open two menus on one right click.
if (hasUserInfoPopup && (obj == userTree || obj == userTree->viewport()) && event->type() == QEvent::ContextMenu) {
auto *contextEvent = static_cast<QContextMenuEvent *>(event);
if (contextEvent->reason() == QContextMenuEvent::Keyboard) {
@ -1174,7 +1186,7 @@ void UserListWidget::positionPopup(UserListTWI *item)
} else if (spaceAbove >= popH) {
y = itemTopY - popH; // bottom of popup meets top of item, grows upward
} else {
// Neither side fits cleanly — pick the roomier side and let clamp handle the rest
// Neither side fits cleanly, pick the roomier side and let clamp handle the rest
y = (spaceBelow >= spaceAbove) ? itemTopY : (itemTopY - popH);
}
y = qBound(screen.top() + margin, y, screen.bottom() - popH - margin);
@ -1760,7 +1772,7 @@ void UserListWidget::updateSectionDivider(Section section)
const QString arrow = divider->isExpanded() ? QStringLiteral("\u25BE") : QStringLiteral("\u25B8");
if (section == Section::Buddy) {
// The buddy divider reports how many of the shown buddies are online,
// mirroring the "Buddies online: %1 / %2" title of the non-sectioned
// mirroring the "Buddies online: %1 / %2" title of the non sectioned
// buddy list.
divider->setText(0, tr("%1 %2 (%3/%4)").arg(arrow, sectionTitle(section)).arg(online).arg(visible));
} else {
@ -1877,8 +1889,8 @@ UserListTWI *UserListWidget::ensureSectionMembership(Section section, const Serv
updateCardArtParams(user, userName);
// Dialog mode: rows that fail the user filter never exist. applyFilter()
// re-checks the predicate on every pass so a live state change (e.g. the
// user being ignored mid-dialog) hides an already created row.
// re checks the predicate on every pass so a live state change (e.g. the
// user being ignored mid dialog) hides an already created row.
if (userFilter && !userFilter(userName, online)) {
return nullptr;
}