Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: The problem of incorrect scrollbars in the content area when adjusting the window size in grid view #2278

Merged
merged 1 commit into from
Sep 12, 2024
Merged

fix: The problem of incorrect scrollbars in the content area when adjusting the window size in grid view #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/plugins/filemanager/core/dfmplugin-workspace/views/fileview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,9 @@ bool FileView::edit(const QModelIndex &index, QAbstractItemView::EditTrigger tri

void FileView::resizeEvent(QResizeEvent *event)
{
d->isResizeEvent = true;
DListView::resizeEvent(event);
d->isResizeEvent = false;

updateHorizontalOffset();

Expand Down Expand Up @@ -1456,14 +1458,16 @@ void FileView::updateGeometries()
#ifdef DTKWIDGET_CLASS_DSizeMode
iconVerticalTopMargin = DSizeModeHelper::element(kCompactIconVerticalTopMargin, kIconVerticalTopMargin);
#endif
resizeContents(contentsSize().width(), contentsSize().height() + iconVerticalTopMargin);
if (!d->isResizeEvent
|| (d->isResizeEvent && d->lastContentHeight > 0 && d->lastContentHeight != contentsSize().height()))
resizeContents(contentsSize().width(), contentsSize().height() + iconVerticalTopMargin);
d->lastContentHeight = contentsSize().height();
}
if (!d->headerView || !d->allowedAdjustColumnSize) {
return DListView::updateGeometries();
}

resizeContents(d->headerView->length(), contentsSize().height());

DListView::updateGeometries();
}

Expand Down
2 changes: 2 additions & 0 deletions src/plugins/filemanager/core/dfmplugin-workspace/views/private/fileview_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ class FileViewPrivate
int horizontalOffset { 0 };
int cachedViewWidth { -1 };
bool isShowViewSelectBox { false };
bool isResizeEvent { false };
int lastContentHeight { 0 };

QList<QUrl> preSelectionUrls;
QTimer *preSelectTimer { nullptr };
Expand Down
Loading