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

Remove strut when dock placed at screens edge

Browse Source 
Change-Id: I745b42508d7a311a78201e33388e4e78c217f35c
This commit is contained in:
石博文 2017-02-28 11:31:48 +08:00 committed by Deepin Code Review
parent 49503f59d5
commit 69612a6a41
Notes: Deepin Code Review 2017-03-01 14:23:55 +08:00 
Verified+1: Anonymous Coward #1000004
Verified+1: <yefei@linuxdeepin.com>
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Wed, 01 Mar 2017 14:23:55 +0800
Reviewed-on: https://cr.deepin.io/20845
Project: dde/dde-dock
Branch: refs/heads/master
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frame/window/mainwindow.cpp
View File

@ -3,6 +3,8 @@
#include <QDebug>
#include <QResizeEvent>
#include <QScreen>
#include <QGuiApplication>
MainWindow::MainWindow(QWidget *parent)
: QWidget(parent),
@ -285,6 +287,8 @@ void MainWindow::setStrutPartial()
const QPoint p = m_posChangeAni->endValue().toPoint();
const QRect r = QRect(p, m_settings->windowSize());
QRect strutArea(0, 0, maxScreenWidth, maxScreenHeight);
switch (side)
{
case Position::Top:
@ -292,28 +296,51 @@ void MainWindow::setStrutPartial()
strut = r.bottom() + 1;
strutStart = r.left();
strutEnd = r.right();
strutArea.setLeft(strutStart);
strutArea.setRight(strutEnd);
strutArea.setBottom(r.bottom());
break;
case Position::Bottom:
orientation = XcbMisc::OrientationBottom;
strut = maxScreenHeight - p.y();
strutStart = r.left();
strutEnd = r.right();
strutArea.setLeft(strutStart);
strutArea.setRight(strutEnd);
strutArea.setTop(p.y());
break;
case Position::Left:
orientation = XcbMisc::OrientationLeft;
strut = r.right() + 1;
strutStart = r.top();
strutEnd = r.bottom();
strutArea.setTop(r.top());
strutArea.setBottom(r.bottom());
strutArea.setRight(r.right());
break;
case Position::Right:
orientation = XcbMisc::OrientationRight;
strut = maxScreenWidth - r.left();
strutStart = r.top();
strutEnd = r.bottom();
strutArea.setTop(r.top());
strutArea.setBottom(r.bottom());
strutArea.setLeft(r.left());
break;
default:
Q_ASSERT(false);
}
// pass if strut area is intersect with other screen
int count = 0;
for (auto *screen : qApp->screens())
if (screen->geometry().intersects(strutArea))
++count;
if (count > 1)
return;
else if (count != 1)
qWarning() << strutArea << p << r << count << orientation << strut << strutStart << strutEnd;
m_xcbMisc->set_strut_partial(winId(), orientation, strut, strutStart, strutEnd);
}