kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 01:33:50 +03:00
Code Issues Projects Releases Wiki Activity

accept Explicit and Primary on same screen edge

Browse Source 
--we now accept Explicit Views in the same screen edge
with OnPrimary Views At ALL CASES and we do not remove
them until the Screens properties have created a deprecated
valid Screens Views Map
This commit is contained in:
Michail Vourlakos 2021-03-03 22:21:36 +02:00
parent 03bd034898
commit b6f43057ce
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/layout/genericlayout.cpp
View File

@ -840,10 +840,11 @@ void GenericLayout::addView(Plasma::Containment *containment, bool forceOnPrimar
//! explicit dock can not be added at explicit screen when that screen is the same with //! explicit dock can not be added at explicit screen when that screen is the same with
//! primary screen and that edge is already occupied by a primary dock //! primary screen and that edge is already occupied by a primary dock
if (nextScreen == qGuiApp->primaryScreen() && primaryDockOccupyEdge(containment->location())) { //! CAN BE REMOVED because we now accept primary and explicit views on ACTIVE SCREENS at ALL CASES
qDebug() << "Rejected : adding explicit view, primary dock occupies edge at screen ! : " << connector; //if (nextScreen == qGuiApp->primaryScreen() && primaryDockOccupyEdge(containment->location())) {
return; // qDebug() << "Rejected : adding explicit view, primary dock occupies edge at screen ! : " << connector;
} // return;
// }
} }
if (Layouts::Storage::isValid(id) && onPrimary) { if (Layouts::Storage::isValid(id) && onPrimary) {
@ -1244,12 +1245,20 @@ Layout::ViewsMap GenericLayout::validViewsMap(Layout::ViewsMap *occupiedMap)
//! valid location //! valid location
Plasma::Types::Location location = containment->location(); Plasma::Types::Location location = containment->location();
if (onPrimary && (!occupiedMap || !(*occupiedMap)[prmScreenName].contains(location))) { if (onPrimary) {
map[prmScreenName][location] << containment->id(); map[prmScreenName][location] << containment->id();
} else {
QString expScreenName = m_corona->screenPool()->connector(screenId);
if (m_corona->screenPool()->isScreenActive(screenId)) {
map[expScreenName][location] << containment->id();
}
} }
} }
} }
/*
//! CAN BE REMOVED because we now accept primary and explicit views on ACTIVE SCREENS at ALL CASES
Layout::ViewsMap explicitMap; Layout::ViewsMap explicitMap;
//! second step: explicit docks must be placed in their screens if the screen edge is free //! second step: explicit docks must be placed in their screens if the screen edge is free
@ -1294,7 +1303,7 @@ Layout::ViewsMap GenericLayout::validViewsMap(Layout::ViewsMap *occupiedMap)
for(const Plasma::Types::Location &expLocation : explicitMap[expScreenName].keys()) { for(const Plasma::Types::Location &expLocation : explicitMap[expScreenName].keys()) {
map[expScreenName][expLocation] << explicitMap[expScreenName][expLocation]; map[expScreenName][expLocation] << explicitMap[expScreenName][expLocation];
} }
} }*/
return map; return map;
} }