Skip to content

refactor: remove redundant positionViewAtBeginning functions #736

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
wjyrich merged 1 commit into from
Mar 16, 2026
Merged

refactor: remove redundant positionViewAtBeginning functions #736

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
6 changes: 1 addition & 5 deletions qml/GridViewContainer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -44,10 +44,6 @@ FocusScope {
gridView.currentIndex = 0
}

function positionViewAtBeginning() {
gridView.positionViewAtBeginning()
}

function itemAt(x, y) {
let point = mapToItem(gridView, x, y)
return gridView.itemAt(point.x, point.y)
Expand Down
7 changes: 1 addition & 6 deletions qml/windowed/AnalysisView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -21,11 +21,6 @@ Control {
frequentlyUsedView.focus = true
}

function positionViewAtBeginning() {
frequentlyUsedView.positionViewAtBeginning()
recentlyInstalledView.positionViewAtBeginning()
}

contentItem: ColumnLayout {
spacing: 0

Expand Down
7 changes: 5 additions & 2 deletions qml/windowed/FreeSortListView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ Item {
listView.focus = true
}

function positionViewAtBeginning() {
listView.positionViewAtBeginning()
Connections {
target: ItemArrangementProxyModel
function onItemBroughtToFront() {
listView.positionViewAtBeginning()
}
}

function resetViewState() {
Expand Down
6 changes: 1 addition & 5 deletions qml/windowed/FrequentlyUsedView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -25,10 +25,6 @@ Control {
property int count: frequentlyUsedViewContainer.count
property int maxCount: 16

function positionViewAtBeginning() {
frequentlyUsedViewContainer.positionViewAtBeginning()
}

contentItem: ColumnLayout {
spacing: 0

Expand Down
6 changes: 1 addition & 5 deletions qml/windowed/GridViewContainer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -39,10 +39,6 @@ FocusScope {
property ScrollBar vScrollBar
property alias currentIndex: gridView.currentIndex

function positionViewAtBeginning() {
gridView.positionViewAtBeginning()
}

function itemAt(x, y) {
let point = mapToItem(gridView, x, y)
return gridView.itemAt(point.x, point.y)
Expand Down
6 changes: 1 addition & 5 deletions qml/windowed/RecentlyInstalledView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -24,10 +24,6 @@ Control {
recentlyInstalledViewContainer.focus = true
}

function positionViewAtBeginning() {
recentlyInstalledViewContainer.positionViewAtBeginning()
}

contentItem: ColumnLayout {
spacing: 0
Label {
Expand Down
6 changes: 1 addition & 5 deletions qml/windowed/SearchResultView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -25,10 +25,6 @@ Control {
searchResultViewContainer.currentItem?.itemClicked()
}

function positionViewAtBeginning() {
searchResultViewContainer.positionViewAtBeginning()
}

contentItem: ColumnLayout {
spacing: 0
visible: searchResultViewContainer.count > 0
Expand Down
4 changes: 3 additions & 1 deletion src/models/itemarrangementproxymodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023-2026 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -66,6 +66,8 @@ void ItemArrangementProxyModel::bringToFront(const QString & id)
emit dataChanged(index(0, 0), index(rowCount() - 1, 0), {
PageRole, IndexInPageRole, FolderIdNumberRole, IconsNameRole
});

emit itemBroughtToFront();
}

void ItemArrangementProxyModel::commitDndOperation(const QString &dragId, const QString &dropId, const DndOperation op, int pageHint)
Expand Down
3 changes: 2 additions & 1 deletion src/models/itemarrangementproxymodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -71,6 +71,7 @@ class ItemArrangementProxyModel : public QConcatenateTablesProxyModel
signals:
void topLevelPageCountChanged();
void folderPageCountChanged(int folderId);
void itemBroughtToFront();

private:
explicit ItemArrangementProxyModel(QObject *parent = nullptr);
Expand Down
Loading