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

Merge branch 'dev/sp3/multi-screen-dock' into uos

Browse Source 
Change-Id: I5cff2310231721be11945a27bf9692ca0ada6110
This commit is contained in:
Fan PengCheng 2020-07-28 10:26:07 +08:00
commit 8ed249982a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frame/window/mainwindow.cpp
View File

@ -136,6 +136,7 @@ MainWindow::MainWindow(QWidget *parent)
, m_platformWindowHandle(this)
, m_wmHelper(DWindowManagerHelper::instance())
, m_eventInter(new XEventMonitor("com.deepin.api.XEventMonitor", "/com/deepin/api/XEventMonitor", QDBusConnection::sessionBus()))
, m_launcherInter(new DBusLuncher("com.deepin.dde.Launcher","/com/deepin/dde/Launcher",QDBusConnection::sessionBus()))
, m_positionUpdateTimer(new QTimer(this))
, m_expandDelayTimer(new QTimer(this))
, m_leaveDelayTimer(new QTimer(this))
@ -1020,6 +1021,9 @@ void MainWindow::onRegionMonitorChanged(int x, int y, const QString &key)
expand();
} else {
// 移动Dock至相应屏相应位置
if (m_launcherInter->IsVisible())//启动器显示,则dock不显示
return;
if (m_settings->setDockScreen(screen->name())) {
if (m_settings->hideMode() == KeepShowing || m_settings->hideMode() == SmartHide) {
narrow();

3
frame/window/mainwindow.h
View File

@ -28,6 +28,7 @@
#include "panel/mainpanelcontrol.h"
#include <com_deepin_api_xeventmonitor.h>
#include <com_deepin_dde_launcher.h>
#include <DPlatformWindowHandle>
#include <DWindowManagerHelper>
@ -39,6 +40,7 @@
DWIDGET_USE_NAMESPACE
using XEventMonitor = ::com::deepin::api::XEventMonitor;
using DBusLuncher = ::com::deepin::dde::Launcher;
class DockSettings;
class DragWidget;
@ -127,6 +129,7 @@ private:
DPlatformWindowHandle m_platformWindowHandle;
DWindowManagerHelper *m_wmHelper;
XEventMonitor *m_eventInter;
DBusLuncher* m_launcherInter;
QString m_registerKey{""};
QTimer *m_positionUpdateTimer;
QTimer *m_expandDelayTimer;