fix: [titlebar]view mode button issue

do not change view mode if the dir has set mode by user when change setting. Log: fix titlebar issue Bug: https://pms.uniontech.com/bug-view-238527.html
linuxdeepin · Jan 23, 2024 · 53b800e · 53b800e
1 parent 3fcd1a1
commit 53b800e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/plugins/filemanager/core/dfmplugin-titlebar/views/optionbuttonbox.cpp b/src/plugins/filemanager/core/dfmplugin-titlebar/views/optionbuttonbox.cpp
@@ -75,8 +75,12 @@ void OptionButtonBoxPrivate::switchMode(ViewMode mode)
 
 void OptionButtonBoxPrivate::onViewModeChanged(int mode)
 {
-    auto viewMode = static_cast<ViewMode>(mode);
-    switchMode(viewMode);
+    if (Application::appObtuselySetting()->value("FileViewState", currentUrl).toMap().contains("viewMode")) {
+        loadViewMode(currentUrl);
+    } else {
+        auto viewMode = static_cast<ViewMode>(mode);
+        switchMode(viewMode);
+    }
 }
 
 DToolButton *OptionButtonBox::detailButton() const
@@ -131,6 +135,8 @@ void OptionButtonBox::onUrlChanged(const QUrl &url)
         d->iconViewButton->setHidden(false);
         d->detailButton->setHidden(false);
     }
+
+    d->currentUrl = url;
 }
 
 void OptionButtonBox::initializeUi()

diff --git a/src/plugins/filemanager/core/dfmplugin-titlebar/views/private/optionbuttonbox_p.h b/src/plugins/filemanager/core/dfmplugin-titlebar/views/private/optionbuttonbox_p.h
@@ -48,6 +48,7 @@ public slots:
     QHBoxLayout *hBoxLayout { nullptr };
 
     ViewMode currentMode { ViewMode::kIconMode };
+    QUrl currentUrl;
 };
 }   // namespace dfmplugin_titlebar