Skip to content

fix: 修复 setNewResolutionList 排序不一致导致分辨率索引错位 #477

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

Merged
deepin-bot merged 1 commit into from
May 28, 2026
Merged

fix: 修复 setNewResolutionList 排序不一致导致分辨率索引错位 #477

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
4 changes: 2 additions & 2 deletions src/src/Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ void Settings::setNewResolutionList()
QStringList resolutiontemp1 = resolutionDatabase[j].split("x");
QStringList resolutiontemp2 = resolutionDatabase[j + 1].split("x");

if ((resolutiontemp1[0].toInt() <= resolutiontemp2[0].toInt())
|| (resolutiontemp1[1].toInt() < resolutiontemp2[1].toInt())) {
if ((resolutiontemp1[0].toInt() < resolutiontemp2[0].toInt()) ||
(resolutiontemp1[0].toInt() == resolutiontemp2[0].toInt() && (resolutiontemp1[1].toInt() < resolutiontemp2[1].toInt()))) {
Comment on lines +139 to +140
Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot May 28, 2026

Choose a reason for hiding this comment

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

suggestion: Avoid repeated toInt() calls and simplify the comparison expression.

Extract the int values before the condition and compare those instead:

int w1 = resolutiontemp1[0].toInt();
int h1 = resolutiontemp1[1].toInt();
int w2 = resolutiontemp2[0].toInt();
int h2 = resolutiontemp2[1].toInt();

if (w1 < w2 || (w1 == w2 && h1 < h2)) {
    ...
}

This avoids repeated conversions inside the loop and makes the sort logic easier to follow.

QString resolutionstr = resolutionDatabase[j + 1];
resolutionDatabase[j + 1] = resolutionDatabase[j];
resolutionDatabase[j] = resolutionstr;
Expand Down
Loading