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

improvements for multips views and sidebars

Browse Source
This commit is contained in:
Michail Vourlakos 2020-03-07 21:24:06 +02:00
parent f011541011
commit d3a07b5371
5 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/layout/genericlayout.cpp
View File

@ -895,10 +895,22 @@ void GenericLayout::toggleHiddenState(QString screenName, Plasma::Types::Locatio
validScreenName = screenName;
}
int viewsOnEdge{0};
for(const auto view : latteViews()) {
if (view->positioner()->currentScreenName() == validScreenName && view->location() == edge) {
view->visibility()->toggleHiddenState();
return;
viewsOnEdge++;
}
}
if (viewsOnEdge >= 1) {
for(const auto view : latteViews()) {
if (view->positioner()->currentScreenName() == validScreenName && view->location() == edge) {
if (viewsOnEdge == 1 || (viewsOnEdge >1 && view->visibility() && view->visibility()->mode() == Latte::Types::SideBar)) {
view->visibility()->toggleHiddenState();
return;
}
}
}
}
}

4
app/plasma/extended/screengeometries.h
View File

@ -64,10 +64,8 @@ private:
Latte::Corona *m_corona{nullptr};
QList<Latte::Types::Visibility> m_ignoreModes{
Latte::Types::None,
Latte::Types::AutoHide,
Latte::Types::SideBar,
Latte::Types::NormalWindow
Latte::Types::SideBar
};
QStringList m_lastScreenNames;

6
app/view/positioner.cpp
View File

@ -416,10 +416,8 @@ void Positioner::syncGeometry()
auto latteCorona = qobject_cast<Latte::Corona *>(m_view->corona());
int fixedScreen = m_view->onPrimary() ? latteCorona->screenPool()->primaryScreenId() : m_view->containment()->screen();
QList<Types::Visibility> ignoreModes({Latte::Types::None,
Latte::Types::AutoHide,
Latte::Types::SideBar,
Latte::Types::NormalWindow});
QList<Types::Visibility> ignoreModes({Latte::Types::AutoHide,
Latte::Types::SideBar});
QList<Plasma::Types::Location> ignoreEdges({Plasma::Types::LeftEdge,
Plasma::Types::RightEdge});

9
app/view/settings/primaryconfigview.cpp
View File

@ -231,7 +231,14 @@ void PrimaryConfigView::deleteSecondaryWindow()
void PrimaryConfigView::updateAvailableScreenGeometry(View *origin)
{
int currentScrId = m_latteView->positioner()->currentScreenId();
m_availableScreenGeometry = m_corona->availableScreenRectWithCriteria(currentScrId, QString(), {}, {}, false);
QList<Latte::Types::Visibility> ignoreModes{Latte::Types::SideBar};
if (m_latteView->visibility() && m_latteView->visibility()->mode() == Latte::Types::SideBar) {
ignoreModes.removeAll(Latte::Types::SideBar);
}
m_availableScreenGeometry = m_corona->availableScreenRectWithCriteria(currentScrId, QString(), ignoreModes, {}, false);
emit availableScreenGeometryChanged();
}

4
app/wm/tracker/windowstracker.h
View File

@ -175,7 +175,6 @@ private:
//! Accept only ALWAYSVISIBLE visibility mode
QList<Latte::Types::Visibility> m_ignoreModes{
Latte::Types::None,
Latte::Types::AutoHide,
Latte::Types::DodgeActive,
Latte::Types::DodgeMaximized,
@ -183,8 +182,7 @@ private:
Latte::Types::WindowsGoBelow,
Latte::Types::WindowsCanCover,
Latte::Types::WindowsAlwaysCover,
Latte::Types::SideBar,
Latte::Types::NormalWindow
Latte::Types::SideBar
};
QMap<WindowId, WindowInfoWrap> m_windows;