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

Resolve the issue of the probability of crashing when switching to an imported view #258

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Resolve the issue of the probability of crashing when switching to an imported view #258

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
3 changes: 0 additions & 3 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ int main(int argc, char *argv[])
.arg(app.applicationVersion());
qDebug() << "LogFile:" << DLogManager::getlogFilePath();

DLogManager::registerConsoleAppender();
DLogManager::registerFileAppender();

QQmlApplicationEngine engine;

if (!DGuiApplicationHelper::instance()->setSingleInstance(app.applicationName(), DGuiApplicationHelper::UserScope)) {
Expand Down
1 change: 1 addition & 0 deletions src/qml/SideBar/Sidebar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import "../"
ScrollView {
id: sidebarScrollView
clip: true
wheelEnabled: false
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

考虑较多条目时，需要滚动展示的场景。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已修改，在显示内容不全时，才激活垂直滚轮

signal sideBarListChanged(string type, string displayName)
property int currentImportCustomIndex: 0 //自动导入相册当前索引值
property int currentCustomIndex: 0 //自定义相册当前索引值
Expand Down
10 changes: 4 additions & 6 deletions src/qml/ThumbnailImageView/HaveImportedView/HaveImportedView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ BaseView {
}

onVisibleChanged: {
if (visible && !GStatus.backingToMainAlbumView)
if (visible && !GStatus.backingToMainAlbumView) {
flushHaveImportedView()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

验证下低性能机器，是否还有问题

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

暂无问题。

if (show)
showAnimation.start()
}
}

// 筛选类型改变处理事件
Expand Down Expand Up @@ -176,11 +179,6 @@ BaseView {
easing.type: Easing.OutExpo
}

onShowChanged: {
if (show)
showAnimation.start()
}

function setDataRange(str) {
importTimeLabel.text = str
}
Expand Down
Loading