kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-10 09:57:35 +03:00
Code Issues Projects Releases Wiki Activity

MultipleLayouts:fixes/improvements in multi-screen

Browse Source
This commit is contained in:
Michail Vourlakos 2018-01-31 19:34:19 +02:00
parent 3d471ee884
commit a0d1d4ccf6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/dockview.cpp
View File

@ -22,6 +22,7 @@
#include "dockconfigview.h"
#include "dockcorona.h"
#include "panelshadows_p.h"
#include "screenpool.h"
#include "visibilitymanager.h"
#include "../liblattedock/extras.h"
@ -481,12 +482,18 @@ void DockView::reconsiderScreen()
if ((m_onPrimary || (tasksPresent() && dockCorona->noDocksWithTasks() == 1 && !screenExists))
&& (m_screenToFollowId != qGuiApp->primaryScreen()->name()
|| m_screenToFollow != qGuiApp->primaryScreen())) {
using Plasma::Types;
QList<Types::Location> edges{Types::BottomEdge, Types::LeftEdge,
Types::TopEdge, Types::RightEdge};
edges = m_managedLayout ? m_managedLayout->freeEdges(qGuiApp->primaryScreen()) : edges;
//change to primary screen only if the specific edge is free
qDebug() << "updating the primary screen for dock...";
qDebug() << "available primary screen edges:" << dockCorona->freeEdges(qGuiApp->primaryScreen());
qDebug() << "available primary screen edges:" << edges;
qDebug() << "dock location:" << location();
if (dockCorona->freeEdges(qGuiApp->primaryScreen()).contains(location())) {
if (edges.contains(location())) {
//! case 2
if (!m_onPrimary && !screenExists && tasksPresent() && (dockCorona->noDocksWithTasks() == 1)) {
qDebug() << "reached case 2 of updating dock primary screen...";
@ -955,7 +962,9 @@ inline void DockView::syncGeometry()
if (formFactor() == Plasma::Types::Vertical) {
QString layoutName = m_managedLayout ? m_managedLayout->name() : QString();
auto dockCorona = qobject_cast<DockCorona *>(corona());
freeRegion = dockCorona->availableScreenRegionWithCriteria(this->containment()->screen(), layoutName);
int fixedScreen = onPrimary() ? dockCorona->screenPool()->primaryScreenId() : this->containment()->screen();
freeRegion = dockCorona->availableScreenRegionWithCriteria(fixedScreen, layoutName);
maximumRect = maximumNormalGeometry();
QRegion availableRegion = freeRegion.intersected(maximumRect);
availableScreenRect = freeRegion.intersected(maximumRect).boundingRect();