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 'revert-d124f940' into 'uos'

Browse Source 
Revert "Merge branch 'fengshaoxiong/uos_Bug21835' into 'uos'"

See merge request dde-v20/dde-dock!591
This commit is contained in:
范朋程 2020-06-13 14:36:40 +08:00
commit 25745c873d
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frame/window/mainwindow.cpp
View File

@ -979,16 +979,6 @@ void MainWindow::onRegionMonitorChanged(int x, int y, const QString &key)
return;
QScreen *screen = Utils::screenAtByScaled(QPoint(x, y));
if(!screen) {
if (m_settings->hideMode() == KeepShowing)
return;
if (!isVisible())
setVisible(true);
return;
}
if (screen->name() == m_settings->currentDockScreen()) {
if (m_settings->hideMode() == KeepShowing)
@ -1019,14 +1009,15 @@ void MainWindow::updateRegionMonitorWatch()
QList<QRect> screensRect = m_settings->monitorsRect();
QList<MonitRect> monitorAreas;
const qreal scale = devicePixelRatioF();
int val = 3;
int x, y, w, h;
auto func = [&](MonitRect &monitRect){
monitRect.x1 = x;
monitRect.y1 = y;
monitRect.x2 = x + w;
monitRect.y2 = y + h;
monitRect.x1 = int(x * scale);
monitRect.y1 = int(y * scale);
monitRect.x2 = int((x + w) * scale);
monitRect.y2 = int((y + h) * scale);
monitorAreas << monitRect;
};