Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: 任务栏主屏改变信号由qt接口获取，保持数据源统一 (#549)

Browse Source 
之前wayland下主屏数据的错误已经在dwayland中进行了修复。这部分需要改回来

Log: 任务栏主屏改变信号由qt接口获取，保持数据源统一
Influence: 任务栏跟随主屏显示的功能
Bug: https://pms.uniontech.com/bug-view-146451.html
Change-Id: I0b9217a476ef814ca4d793e16e2c31a1b54d11cb

Co-authored-by: 范朋程 <fanpengcheng@uniontech.com>
This commit is contained in:
ssk 2022-08-03 16:21:05 +08:00 committed by GitHub
parent 4380beb660
commit 2db76eb6dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frame/display/displaymanager.cpp
View File

@ -31,17 +31,9 @@ DisplayManager::DisplayManager(QObject *parent)
: QObject(parent) : QObject(parent)
, m_gsettings(Utils::SettingsPtr("com.deepin.dde.dock.mainwindow", "/com/deepin/dde/dock/mainwindow/", this)) , m_gsettings(Utils::SettingsPtr("com.deepin.dde.dock.mainwindow", "/com/deepin/dde/dock/mainwindow/", this))
, m_onlyInPrimary(Utils::SettingValue("com.deepin.dde.dock.mainwindow", "/com/deepin/dde/dock/mainwindow/", "onlyShowPrimary", false).toBool()) , m_onlyInPrimary(Utils::SettingValue("com.deepin.dde.dock.mainwindow", "/com/deepin/dde/dock/mainwindow/", "onlyShowPrimary", false).toBool())
, m_displayInter(nullptr)
{ {
connect(qApp, &QApplication::primaryScreenChanged, this, &DisplayManager::primaryScreenChanged); connect(qApp, &QApplication::primaryScreenChanged, this, &DisplayManager::primaryScreenChanged);
if (Utils::IS_WAYLAND_DISPLAY) { connect(qApp, &QApplication::primaryScreenChanged, this, &DisplayManager::dockInfoChanged);
// TODO wayland下无主屏概念，此方案并不是最优解，窗管如果扩展了这部分协议，我们可以通过协议达成此目的
m_displayInter = new DisplayInter("com.deepin.daemon.Display", "/com/deepin/daemon/Display",QDBusConnection::sessionBus(), this);
connect(m_displayInter, &__Display::PrimaryChanged, this, &DisplayManager::dockInfoChanged);
connect(m_displayInter, &__Display::DisplayModeChanged, this, &DisplayManager::dockInfoChanged);
} else {
connect(qApp, &QApplication::primaryScreenChanged, this, &DisplayManager::dockInfoChanged);
}
connect(qApp, &QGuiApplication::screenAdded, this, &DisplayManager::screenCountChanged); connect(qApp, &QGuiApplication::screenAdded, this, &DisplayManager::screenCountChanged);
connect(qApp, &QGuiApplication::screenRemoved, this, &DisplayManager::screenCountChanged); connect(qApp, &QGuiApplication::screenRemoved, this, &DisplayManager::screenCountChanged);
@ -172,7 +164,7 @@ void DisplayManager::updateScreenDockInfo()
// 仅显示在主屏时的处理 // 仅显示在主屏时的处理
if (m_onlyInPrimary) { if (m_onlyInPrimary) {
for (auto s : m_screens) { for (auto s : m_screens) {
if (Utils::IS_WAYLAND_DISPLAY ? !s->model().contains(m_displayInter->primary()) : s != qApp->primaryScreen()) { if (s != qApp->primaryScreen()) {
QMap <Position, bool> map; QMap <Position, bool> map;
map.insert(Position::Top, false); map.insert(Position::Top, false);
map.insert(Position::Bottom, false); map.insert(Position::Bottom, false);

4
frame/display/displaymanager.h
View File

@ -27,9 +27,6 @@
#include "singleton.h" #include "singleton.h"
#include "constants.h" #include "constants.h"
#include <com_deepin_daemon_display.h>
using DisplayInter = com::deepin::daemon::Display;
using namespace Dock; using namespace Dock;
class QScreen; class QScreen;
@ -78,7 +75,6 @@ private:
QMap<QScreen *, QMap<Position, bool>> m_screenPositionMap; QMap<QScreen *, QMap<Position, bool>> m_screenPositionMap;
const QGSettings *m_gsettings; // 多屏配置控制 const QGSettings *m_gsettings; // 多屏配置控制
bool m_onlyInPrimary; bool m_onlyInPrimary;
DisplayInter *m_displayInter;
}; };
#endif // DISPLAYMANAGER_H #endif // DISPLAYMANAGER_H