Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-02 15:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复始终隐藏任务栏的配置项失效的问题 (#694)

Browse Source 
在部分时机，例如，来回切换主屏，任务栏在设置始终隐藏后仍然会显示
这是因为之前wayland下的修改，会强制显示任务栏，避免任务栏界面被qwayland库的接口隐藏

Log: 修复始终隐藏任务栏的配置项失效的问题
Task: https://pms.uniontech.com/task-view-194931.html
Influence: 任务栏的始终隐藏配置
Change-Id: Ib3f8070445a511c523f116b1668969bfd20f4690
This commit is contained in:
ssk 2022-09-20 15:18:10 +08:00 committed by GitHub
parent ac7b5d4b2d
commit 7ef4d5dc91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frame/window/mainwindow.cpp
View File

@ -143,6 +143,7 @@ void MainWindow::launch()
bool showDock = true;
if (m_dconfig.data()->isValid())
showDock = !m_dconfig.data()->value("alwaysHideDock", false).toBool();
qApp->setProperty("ALWAYS_HIDE_DOCK", !showDock);
setVisible(showDock);
if (!showDock && m_multiScreenWorker->dockInter()) {
m_multiScreenWorker->dockInter()->setHideMode(KeepHidden);
@ -298,6 +299,7 @@ void MainWindow::initComponents()
connect(m_dconfig.data(), &DConfig::valueChanged, this, [this] (const QString &key) {
if (key == "alwaysHideDock") {
const bool showDock = !m_dconfig.data()->value(key, false).toBool();
qApp->setProperty("ALWAYS_HIDE_DOCK", !showDock);
setVisible(showDock);
if (!showDock && m_multiScreenWorker->dockInter()) {
m_multiScreenWorker->dockInter()->setHideMode(KeepHidden);
@ -678,3 +680,13 @@ void MainWindow::sendNotifications()
.call();
});
}
void MainWindow::setVisible(bool visible)
{
// 设置了始终隐藏的情况下，任务栏将永远不显示
if (visible && qApp->property("ALWAYS_HIDE_DOCK").toBool()) {
return;
}
return DBlurEffectWidget::setVisible(visible);
}

3
frame/window/mainwindow.h
View File

@ -140,6 +140,7 @@ private:
class MainWindow : public DBlurEffectWidget
{
Q_OBJECT
friend class MainPanelControl;
public:
explicit MainWindow(QWidget *parent = nullptr);
@ -149,7 +150,7 @@ public:
void setGeometry(const QRect &rect);
void sendNotifications();
friend class MainPanelControl;
void setVisible(bool visible) override;
MainPanelControl *panel() {return m_mainPanel;}