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

add Layouts Tracking in WindowsTracking

Browse Source
This commit is contained in:
Michail Vourlakos 2019-06-08 15:25:45 +03:00
parent e57ff695ed
commit 0aa5c520dc
2 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
app/wm/tracker/trackerwindows.cpp
View File

@ -22,10 +22,12 @@
// local
#include "lastactivewindow.h"
#include "schemes.h"
#include "trackedlayoutinfo.h"
#include "trackedviewinfo.h"
#include "../abstractwindowinterface.h"
#include "../schemecolors.h"
#include "../../lattecorona.h"
#include "../../layout/genericlayout.h"
#include "../../layouts/manager.h"
#include "../../view/view.h"
#include "../../view/positioner.h"
@ -52,6 +54,14 @@ Windows::~Windows()
}
m_views.clear();
//! clear all the m_layouts tracking layouts
for (QHash<Latte::Layout::GenericLayout *, TrackedLayoutInfo *>::iterator i=m_layouts.begin(); i!=m_layouts.end(); ++i) {
i.value()->deleteLater();
m_layouts[i.key()] = nullptr;
}
m_layouts.clear();
}
void Windows::init()
@ -140,6 +150,14 @@ void Windows::addView(Latte::View *view)
m_views[view] = new TrackedViewInfo(this, view);
updateAvailableScreenGeometries();
//! Consider Layouts
addRelevantLayout(view);
connect(view, &Latte::View::layoutChanged, this, [&, view]() {
addRelevantLayout(view);
});
updateHints(view);
}
@ -151,6 +169,59 @@ void Windows::removeView(Latte::View *view)
m_views[view]->deleteLater();
m_views.remove(view);
updateRelevantLayouts();
}
void Windows::addRelevantLayout(Latte::View *view)
{
if (view->layout() && !m_layouts.contains(view->layout())) {
m_layouts[view->layout()] = new TrackedLayoutInfo(this, view->layout());
updateRelevantLayouts();
}
}
void Windows::updateRelevantLayouts()
{
QList<Latte::Layout::GenericLayout*> orphanedLayouts;
//! REMOVE Orphaned Relevant layouts that have been removed or they dont contain any Views anymore
for (QHash<Latte::Layout::GenericLayout *, TrackedLayoutInfo *>::iterator i=m_layouts.begin(); i!=m_layouts.end(); ++i) {
bool hasView{false};
for (QHash<Latte::View *, TrackedViewInfo *>::iterator j=m_views.begin(); j!=m_views.end(); ++j) {
if (j.key() && i.key() && i.key() == j.key()->layout()) {
hasView = true;
break;
}
}
if (!hasView) {
if (i.value()) {
i.value()->deleteLater();
}
orphanedLayouts << i.key();
}
}
for(const auto &layout : orphanedLayouts) {
m_layouts.remove(layout);
}
//! UPDATE Enabled layout window tracking based on the Views that are requesting windows tracking
for (QHash<Latte::Layout::GenericLayout *, TrackedLayoutInfo *>::iterator i=m_layouts.begin(); i!=m_layouts.end(); ++i) {
bool hasViewEnabled{false};
for (QHash<Latte::View *, TrackedViewInfo *>::iterator j=m_views.begin(); j!=m_views.end(); ++j) {
if (i.key() == j.key()->layout() && j.value()->enabled()) {
hasViewEnabled = true;
break;
}
}
if (i.value()) {
i.value()->setEnabled(hasViewEnabled);
}
}
}
//! Views Properties And Hints
@ -178,6 +249,8 @@ void Windows::setEnabled(Latte::View *view, const bool enabled)
initViewHints(view);
}
updateRelevantLayouts();
emit enabledChanged(view);
}

11
app/wm/tracker/trackerwindows.h
View File

@ -31,11 +31,15 @@
namespace Latte {
class View;
namespace Layout {
class GenericLayout;
}
namespace WindowSystem {
class AbstractWindowInterface;
class SchemeColors;
namespace Tracker {
class LastActiveWindow;
class TrackedLayoutInfo;
class TrackedViewInfo;
}
}
@ -95,6 +99,10 @@ signals:
private slots:
void updateAvailableScreenGeometries();
void addRelevantLayout(Latte::View *view);
void updateRelevantLayouts();
private:
void init();
void initViewHints(Latte::View *view);
@ -122,8 +130,9 @@ private:
private:
AbstractWindowInterface *m_wm;
QHash<Latte::View *, TrackedViewInfo *> m_views;
QMap<WindowId, WindowInfoWrap > m_windows;
QHash<Latte::Layout::GenericLayout *, TrackedLayoutInfo *> m_layouts;
QMap<WindowId, WindowInfoWrap > m_windows;
};
}