perf: 简化ThumbnailImage控件相关代码

简化ThumbnailImage控件相关代码 Log: 简化ThumbnailImage控件相关代码
linuxdeepin · Sep 1, 2023 · 7c7d01c · 7c7d01c
1 parent bc89685
commit 7c7d01c
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 59 deletions.
diff --git a/src/deepin-album.qrc b/src/deepin-album.qrc
@@ -64,5 +64,6 @@
         <file>qml/Control/ListView/ThumbnailListView2.qml</file>
         <file>qml/Control/ListView/ThumbnailListDelegate2.qml</file>
         <file>qml/Control/ListView/ThumbnailListViewTools.js</file>
+        <file>qml/Control/BaseView.qml</file>
     </qresource>
 </RCC>
diff --git a/src/qml/Control/BaseView.qml b/src/qml/Control/BaseView.qml
@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+
+Item {
+    anchors.fill: parent
+    anchors.topMargin: 0
+    anchors.leftMargin: 20
+    anchors.bottomMargin: statusBar.height
+}
+
diff --git a/src/qml/ThumbnailImageView/CollecttionView/CollecttionView.qml b/src/qml/ThumbnailImageView/CollecttionView/CollecttionView.qml
@@ -6,9 +6,11 @@ import QtQuick 2.11
 import QtQuick.Controls 2.4
 import "../"
 import "../../"
+import "../../Control"
+
+BaseView {
+    id: collecttView
 
-Rectangle {
-    id: root
     property int currentViewIndex: 3
 
     // 通知日视图刷新状态栏提示信息

diff --git a/src/qml/ThumbnailImageView/CustomAlbum/CustomAlbum.qml b/src/qml/ThumbnailImageView/CustomAlbum/CustomAlbum.qml
@@ -12,9 +12,7 @@ import "../../Control/ListView"
 import "../../"
 import "../"
 
-Rectangle {
-    width: parent.width
-    height: parent.height
+BaseView {
 
     property int customAlbumUId: global.currentCustomAlbumUId
     property string customAlbumName: "" //相册名称显示内容
@@ -171,7 +169,7 @@ Rectangle {
             topMargin: 10
         }
         width: parent.width
-        height: parent.height - customAlbumTitleRect.height - m_topMargin - statusBar.height
+        height: parent.height - customAlbumTitleRect.height - m_topMargin
         thumnailListType: (global.currentViewIndex === GlobalVar.ThumbnailViewType.CustomAlbum && global.currentCustomAlbumUId > 3) ? GlobalVar.ThumbnailType.CustomAlbum
                                                                                                                                     : GlobalVar.ThumbnailType.Normal
         proxyModel.sourceModel: Album.ImageDataModel { id: dataModel; modelType: Album.Types.CustomAlbum}

diff --git a/src/qml/ThumbnailImageView/DeviceAlbum/DeviceAlbum.qml b/src/qml/ThumbnailImageView/DeviceAlbum/DeviceAlbum.qml
@@ -12,9 +12,8 @@ import "../../Control"
 import "../../Control/ListView"
 import "../../"
 
-Rectangle {
-    width: parent.width
-    height: parent.height
+BaseView {
+    anchors.fill: parentt
 
     property int customAlbumUId: 0
     property string devicePath: global.deviceCurrentPath
@@ -224,7 +223,7 @@ Rectangle {
             topMargin: 10
         }
         width: parent.width
-        height: parent.height - deviceAlbumTitleRect.height - m_topMargin - statusBar.height
+        height: parent.height - deviceAlbumTitleRect.height - m_topMargin
         visible: numLabelText !== ""
         thumnailListType: GlobalVar.ThumbnailType.Device
 

diff --git a/src/qml/ThumbnailImageView/HaveImportedView/HaveImportedView.qml b/src/qml/ThumbnailImageView/HaveImportedView/HaveImportedView.qml
@@ -8,10 +8,7 @@ import "../../Control"
 import "../../"
 import "../"
 
-Rectangle {
-    width: parent.width
-    height: parent.height
-
+BaseView {
     property int filterType : filterCombo.currentIndex // 筛选类型，默认所有
     property string numLabelText: "" //总数标签显示内容
     property string selectedText: getSelectedText(selectedPaths)
@@ -123,9 +120,7 @@ Rectangle {
     // 已导入列表控件
     ImportedlListView {
         id: theView
-        anchors.top: parent.top
-        width: parent.width
-        height: parent.height - statusBar.height
+        anchors.fill: parent
     }
 
     // 若没有数据，显示导入图片视图

diff --git a/src/qml/ThumbnailImageView/RecentlyDeletedView/RecentlyDeletedView.qml b/src/qml/ThumbnailImageView/RecentlyDeletedView/RecentlyDeletedView.qml
@@ -12,9 +12,7 @@ import "../../Control/ListView"
 import "../../"
 import "../"
 
-Rectangle {
-    width: parent.width
-    height: parent.height
+BaseView {
 
     property int filterType : filterCombo.currentIndex // 筛选类型，默认所有
     property string numLabelText: ""
@@ -235,7 +233,7 @@ Rectangle {
             topMargin: 10
         }
         width: parent.width
-        height: parent.height - recentDelTitleRect.height - m_topMargin - statusBar.height
+        height: parent.height - recentDelTitleRect.height - m_topMargin
         thumnailListType: GlobalVar.ThumbnailType.Trash
 
         proxyModel.sourceModel: Album.ImageDataModel { id: dataModel; modelType: Album.Types.RecentlyDeleted}

diff --git a/src/qml/ThumbnailImageView/SearchView.qml b/src/qml/ThumbnailImageView/SearchView.qml
@@ -14,9 +14,7 @@ import org.deepin.album 1.0 as Album
 import "../Control"
 import "../Control/ListView"
 
-Rectangle {
-    width: parent.width
-    height: parent.height
+BaseView {
 
     property string currentKeyword: ""
     property var searchResults: new Array
@@ -153,7 +151,7 @@ Rectangle {
             topMargin: 10
         }
         width: parent.width
-        height: parent.height - resultViewTitleRect.height - m_topMargin - statusBar.height
+        height: parent.height - resultViewTitleRect.height - m_topMargin
 
         proxyModel.sourceModel: Album.ImageDataModel { id: dataModel; modelType: Album.Types.SearchResult}
 

diff --git a/src/qml/ThumbnailImageView/ThumbnailImage.qml b/src/qml/ThumbnailImageView/ThumbnailImage.qml
@@ -21,8 +21,7 @@ import "./../"
 //本文件用于替代stackwidget的作用，通过改变global的0-n来切换窗口
 
 Item {
-    property int m_topMargin: 0
-    property int m_leftMargin: 20
+
     property int m_CollecttionCurrentViewIndex: collecttionView.currentViewIndex
     signal escKeyPressed()
 
@@ -32,60 +31,28 @@ Item {
 
     NoPictureView{
         visible: global.currentViewIndex === GlobalVar.ThumbnailViewType.NoPicture
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
     }
     CollecttionView{
         id: collecttionView
-        color: Qt.rgba(0,0,0,0)
         visible: global.currentViewIndex === GlobalVar.ThumbnailViewType.Collecttion
-        anchors.topMargin: m_topMargin
-        anchors.leftMargin: m_leftMargin
-        anchors.fill: parent
-        anchors.bottomMargin: statusBar.height
     }
     HaveImportedView{
-        id: haveImportedView
-        color: Qt.rgba(0,0,0,0)
         visible: global.currentViewIndex === GlobalVar.ThumbnailViewType.HaveImported
-        anchors.topMargin: m_topMargin
-        anchors.leftMargin: m_leftMargin
-        anchors.fill: parent
     }
     CustomAlbum{
-        color: Qt.rgba(0,0,0,0)
         visible: global.currentViewIndex === GlobalVar.ThumbnailViewType.Favorite
-        anchors.topMargin: m_topMargin
-        anchors.leftMargin: m_leftMargin
-        anchors.fill: parent
     }
     RecentlyDeletedView{
-        color: Qt.rgba(0,0,0,0)
         visible: global.currentViewIndex === GlobalVar.ThumbnailViewType.RecentlyDeleted
-        anchors.topMargin: m_topMargin
-        anchors.leftMargin: m_leftMargin
-        anchors.fill: parent
     }
     CustomAlbum{
-        color: Qt.rgba(0,0,0,0)
         visible: global.currentViewIndex === GlobalVar.ThumbnailViewType.CustomAlbum
-        anchors.topMargin: m_topMargin
-        anchors.leftMargin: m_leftMargin
-        anchors.fill: parent
     }
     SearchView{
-        color: Qt.rgba(0,0,0,0)
         visible: global.currentViewIndex === GlobalVar.ThumbnailViewType.SearchResult
-        anchors.topMargin: m_topMargin
-        anchors.leftMargin: m_leftMargin
-        anchors.fill: parent
     }
     DeviceAlbum{
-        color: Qt.rgba(0,0,0,0)
         visible: global.currentViewIndex === GlobalVar.ThumbnailViewType.Device
-        anchors.topMargin: m_topMargin
-        anchors.leftMargin: m_leftMargin
-        anchors.fill: parent
     }
 
     //export窗口