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

fix: 解决任务栏启动后不显示问题

Browse Source 
计算显示位置时未考虑缩放因素,重构代码中未考虑这里

Log: 修复开启缩放后,任务栏显示一场问题
Bug: https://pms.uniontech.com/zentao/bug-view-41620.html
Change-Id: I03026852f261c78bb0d2e8a6f650c9b8f3805c16
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1379
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
This commit is contained in:
Fan PengCheng 2020-08-06 14:56:44 +08:00 committed by fanpengcheng
parent 98b3f80679
commit 69e9dfa656
4 changed files with 85 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
frame/util/multiscreenworker.cpp
View File

@ -42,7 +42,7 @@ MultiScreenWorker::MultiScreenWorker(QWidget *parent, DWindowManagerHelper *help
, m_eventInter(new XEventMonitor("com.deepin.api.XEventMonitor", "/com/deepin/api/XEventMonitor", QDBusConnection::sessionBus()))
, m_dockInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this))
, m_displayInter(new DisplayInter("com.deepin.daemon.Display", "/com/deepin/daemon/Display", QDBusConnection::sessionBus(), this))
, m_launcherInter(new DBusLuncher("com.deepin.dde.Launcher","/com/deepin/dde/Launcher",QDBusConnection::sessionBus()))
, m_launcherInter(new DBusLuncher("com.deepin.dde.Launcher", "/com/deepin/dde/Launcher", QDBusConnection::sessionBus()))
, m_monitorUpdateTimer(new QTimer(this))
, m_showAni(new QVariantAnimation(this))
, m_hideAni(new QVariantAnimation(this))
@ -314,7 +314,7 @@ void MultiScreenWorker::onRegionMonitorChanged(int x, int y, const QString &key)
#ifdef QT_DEBUG
qDebug() << "boundRect:" << boundRect;
#endif
if ((hideMode() == HideMode::KeepHidden || m_hideMode == HideMode::SmartHide)
if ((m_hideMode == HideMode::KeepHidden || m_hideMode == HideMode::SmartHide)
&& (boundRect.size().isEmpty())) {
showAni(m_ds.current());
}
@ -609,6 +609,11 @@ void MultiScreenWorker::onRequestNotifyWindowManager()
// 先清除原先的窗管任务栏区域
m_xcbMisc->clear_strut_partial(xcb_window_t(parent()->winId()));
// 在副屏时,且为一直显示时,不要挤占应用,这是sp3的新需求
if (m_ds.current() != qApp->primaryScreen()->name() && m_hideMode == HideMode::KeepShowing)
return;
// 除了"一直显示"模式,其他的都不要设置任务栏区域
if (m_hideMode != Dock::KeepShowing)
return;
@ -815,7 +820,7 @@ void MultiScreenWorker::initMembers()
void MultiScreenWorker::initConnection()
{
auto updateGeometry = [ = ](QVariant value){
auto updateGeometry = [ = ](QVariant value) {
QRect rect = value.toRect();
parent()->setFixedSize(rect.size());
parent()->setGeometry(rect);
@ -837,8 +842,8 @@ void MultiScreenWorker::initConnection()
}
};
connect(m_showAni, &QVariantAnimation::valueChanged, this, [ = ](QVariant value){updateGeometry(value);});
connect(m_hideAni, &QVariantAnimation::valueChanged, this, [ = ](QVariant value){updateGeometry(value);});
connect(m_showAni, &QVariantAnimation::valueChanged, this, [ = ](QVariant value) {updateGeometry(value);});
connect(m_hideAni, &QVariantAnimation::valueChanged, this, [ = ](QVariant value) {updateGeometry(value);});
connect(m_showAni, &QVariantAnimation::finished, this, &MultiScreenWorker::showAniFinished);
connect(m_hideAni, &QVariantAnimation::finished, this, &MultiScreenWorker::hideAniFinished);
@ -879,8 +884,8 @@ void MultiScreenWorker::initConnection()
});
connect(m_eventInter, &XEventMonitor::CursorMove, this, &MultiScreenWorker::onRegionMonitorChanged);
connect(m_eventInter, &XEventMonitor::ButtonPress, this, [=]{m_btnPress = true;});
connect(m_eventInter, &XEventMonitor::ButtonRelease, this, [=]{m_btnPress = false;});
connect(m_eventInter, &XEventMonitor::ButtonPress, this, [ = ] {m_btnPress = true;});
connect(m_eventInter, &XEventMonitor::ButtonRelease, this, [ = ] {m_btnPress = false;});
connect(this, &MultiScreenWorker::requestUpdateRegionMonitor, this, &MultiScreenWorker::onRequestUpdateRegionMonitor);
connect(this, &MultiScreenWorker::requestUpdateFrontendGeometry, this, &MultiScreenWorker::onRequestUpdateFrontendGeometry);
@ -1046,7 +1051,7 @@ void MultiScreenWorker::changeDockPosition(QString fromScreen, QString toScreen,
}
});
auto updateGeometry = [ = ](const QString &screenName, const Position &pos,QVariant value){
auto updateGeometry = [ = ](const QString & screenName, const Position & pos, QVariant value) {
const QRect &rect = value.toRect();
parent()->setFixedSize(rect.size());
parent()->setGeometry(rect);
@ -1132,11 +1137,16 @@ QString MultiScreenWorker::getValidScreen(const Position &pos)
// 查找主屏
QString primaryName;
foreach (auto monitor, monitorList) {
primaryName = monitor->name();
break;
if (monitor->name() == qApp->primaryScreen()->name()) {
primaryName = monitor->name();
break;
}
}
Q_ASSERT(!primaryName.isEmpty());
if (primaryName.isEmpty()) {
qDebug() << "cannnot find primary screen";
return QString();
}
Monitor *primaryMonitor = monitorByName(validMonitorList(m_monitorInfo), primaryName);
@ -1212,6 +1222,8 @@ MainWindow *MultiScreenWorker::parent()
QRect MultiScreenWorker::getDockShowGeometry(const QString &screenName, const Position &pos, const DisplayMode &displaymode)
{
//!!! 注意,目前双屏情况下缩放保持一致,不会出现两个屏幕的缩放不一致的情况,如果后面出现了,那么这里可能会有问题
const qreal scale = screenByName(screenName)->devicePixelRatio();
QRect rect;
foreach (Monitor *inter, validMonitorList(m_monitorInfo)) {
if (inter->name() == screenName) {
@ -1219,31 +1231,31 @@ QRect MultiScreenWorker::getDockShowGeometry(const QString &screenName, const Po
switch (static_cast<Position>(pos)) {
case Top: {
rect.setX(inter->x() + WINDOWMARGIN);
rect.setY(inter->y() + WINDOWMARGIN);
rect.setWidth(inter->w() - 2 * WINDOWMARGIN);
rect.setX(inter->x() / scale + WINDOWMARGIN);
rect.setY(inter->y() / scale + WINDOWMARGIN);
rect.setWidth(inter->w() / scale - 2 * WINDOWMARGIN);
rect.setHeight(dockSize);
}
break;
case Bottom: {
rect.setX(inter->x() + WINDOWMARGIN);
rect.setY(inter->y() + inter->h() - WINDOWMARGIN - dockSize);
rect.setWidth(inter->w() - 2 * WINDOWMARGIN);
rect.setX(inter->x() / scale + WINDOWMARGIN);
rect.setY(inter->y() / scale + inter->h() / scale - WINDOWMARGIN - dockSize);
rect.setWidth(inter->w() / scale - 2 * WINDOWMARGIN);
rect.setHeight(dockSize);
}
break;
case Left: {
rect.setX(inter->x() + WINDOWMARGIN);
rect.setY(inter->y() + WINDOWMARGIN);
rect.setX(inter->x() / scale + WINDOWMARGIN);
rect.setY(inter->y() / scale + WINDOWMARGIN);
rect.setWidth(dockSize);
rect.setHeight(inter->h() - 2 * WINDOWMARGIN);
rect.setHeight(inter->h() / scale - 2 * WINDOWMARGIN);
}
break;
case Right: {
rect.setX(inter->x() + inter->w() - WINDOWMARGIN - dockSize);
rect.setY(inter->y() + WINDOWMARGIN);
rect.setX(inter->x() / scale + inter->w() / scale - WINDOWMARGIN - dockSize);
rect.setY(inter->y() / scale + WINDOWMARGIN);
rect.setWidth(dockSize);
rect.setHeight(inter->h() - 2 * WINDOWMARGIN);
rect.setHeight(inter->h() / scale - 2 * WINDOWMARGIN);
}
}
break;
@ -1259,6 +1271,8 @@ QRect MultiScreenWorker::getDockShowGeometry(const QString &screenName, const Po
QRect MultiScreenWorker::getDockHideGeometry(const QString &screenName, const Position &pos, const DisplayMode &displaymode)
{
//!!! 注意,目前双屏情况下缩放保持一致,不会出现两个屏幕的缩放不一致的情况,如果后面出现了,那么这里可能会有问题
const qreal scale = screenByName(screenName)->devicePixelRatio();
QRect rect;
foreach (Monitor *inter, validMonitorList(m_monitorInfo)) {
if (inter->name() == screenName) {
@ -1266,31 +1280,31 @@ QRect MultiScreenWorker::getDockHideGeometry(const QString &screenName, const Po
switch (static_cast<Position>(pos)) {
case Top: {
rect.setX(inter->x() + margin);
rect.setY(inter->y());
rect.setWidth(inter->w() - 2 * margin);
rect.setX(inter->x() / scale + margin);
rect.setY(inter->y() / scale);
rect.setWidth(inter->w() / scale - 2 * margin);
rect.setHeight(0);
}
break;
case Bottom: {
rect.setX(inter->x() + margin);
rect.setY(inter->y() + inter->h());
rect.setWidth(inter->w() - 2 * margin);
rect.setX(inter->x() / scale + margin);
rect.setY(inter->y() / scale + inter->h() / scale);
rect.setWidth(inter->w() / scale - 2 * margin);
rect.setHeight(0);
}
break;
case Left: {
rect.setX(inter->x());
rect.setY(inter->y() + margin);
rect.setX(inter->x() / scale);
rect.setY(inter->y() / scale + margin);
rect.setWidth(0);
rect.setHeight(inter->h() - 2 * margin);
rect.setHeight(inter->h() / scale - 2 * margin);
}
break;
case Right: {
rect.setX(inter->x() + inter->w());
rect.setY(inter->y() + margin);
rect.setX(inter->x() / scale + inter->w() / scale);
rect.setY(inter->y() / scale + margin);
rect.setWidth(0);
rect.setHeight(inter->h() - 2 * margin);
rect.setHeight(inter->h() / scale - 2 * margin);
}
break;
}

62
frame/util/utils.h
View File

@ -26,7 +26,7 @@
#include <QScreen>
namespace Utils {
inline QPixmap renderSVG(const QString &path, const QSize &size, const qreal devicePixelRatio) {
inline QPixmap renderSVG(const QString &path, const QSize &size, const qreal devicePixelRatio) {
QImageReader reader;
QPixmap pixmap;
reader.setFileName(path);
@ -40,43 +40,47 @@ namespace Utils {
}
return pixmap;
}
}
inline QScreen * screenAt(const QPoint &point) {
for (QScreen *screen : qApp->screens()) {
const QRect r { screen->geometry() };
const QRect rect { r.topLeft(), r.size() * screen->devicePixelRatio() };
if (rect.contains(point)) {
return screen;
}
inline QScreen * screenAt(const QPoint &point) {
for (QScreen *screen : qApp->screens()) {
const QRect r { screen->geometry() };
const QRect rect { r.topLeft(), r.size() * screen->devicePixelRatio() };
if (rect.contains(point)) {
return screen;
}
return nullptr;
}
//　判断坐标是否位于屏幕边缘
inline bool onScreenEdge(const QPoint &point) {
for (QScreen *screen : qApp->screens()) {
const QRect r { screen->geometry() };
QRect rect { r.topLeft(), r.size() * screen->devicePixelRatio() };
if ( point.y() == screen->geometry().y()+screen->geometry().height()
|| point.x() == screen->geometry().x()+screen->geometry().width()) {
return true;
}
return nullptr;
}
//　判断坐标是否位于屏幕边缘
//!!! 注意:这里传入的QPoint是未计算缩放的
inline bool onScreenEdge(const QPoint &point) {
for (QScreen *screen : qApp->screens()) {
const QRect r { screen->geometry() };
QRect rect { r.topLeft(), r.size() * screen->devicePixelRatio() };
if ( point.y() == screen->geometry().y()+screen->geometry().height()
|| point.x() == screen->geometry().x()+screen->geometry().width()) {
return true;
}
return false;
}
inline QScreen * screenAtByScaled(const QPoint &point) {
for (QScreen *screen : qApp->screens()) {
if (screen->geometry().contains(point)) {
return screen;
}
return false;
}
//!!! 注意:这里传入的QPoint是未计算缩放的
inline QScreen * screenAtByScaled(const QPoint &point) {
for (QScreen *screen : qApp->screens()) {
const QRect r { screen->geometry() };
QRect rect { r.topLeft(), r.size() * screen->devicePixelRatio() };
if (rect.contains(point)) {
return screen;
}
return nullptr;
}
return nullptr;
}
}
#endif // UTILS

13
frame/window/mainwindow.cpp
View File

@ -135,19 +135,12 @@ void MainWindow::launch()
QTimer::singleShot(400, this, [&] {
m_launched = true;
qApp->processEvents();
initShow();
setVisible(true);
m_multiScreenWorker->initShow();
m_shadowMaskOptimizeTimer->start();
});
}
void MainWindow::initShow()
{
setVisible(true);
m_multiScreenWorker->initShow();
m_shadowMaskOptimizeTimer->start();
}
void MainWindow::showEvent(QShowEvent *e)
{
QWidget::showEvent(e);

2
frame/window/mainwindow.h
View File

@ -127,8 +127,6 @@ public:
public slots:
void launch();
// 第一次显示
void initShow();
private:
using QWidget::show;