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

fix edge margin adjustment

Browse Source
This commit is contained in:
Michail Vourlakos 2020-07-12 15:02:54 +03:00
parent 166ee1899a
commit 19eb9f9ff5
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/view/positioner.cpp
View File

@ -59,6 +59,11 @@ Positioner::Positioner(Latte::View *parent)
m_validateGeometryTimer.setInterval(500);
connect(&m_validateGeometryTimer, &QTimer::timeout, this, &Positioner::syncGeometry);
//! syncGeometry() function is costly, so now we make sure that is not executed too often
m_syncGeometryTimer.setSingleShot(true);
m_syncGeometryTimer.setInterval(150);
connect(&m_syncGeometryTimer, &QTimer::timeout, this, &Positioner::immediateSyncGeometry);
m_corona = qobject_cast<Latte::Corona *>(m_view->corona());
if (m_corona) {
@ -133,12 +138,6 @@ void Positioner::init()
}
});
connect(this, &Positioner::slideOffsetChanged, this, [&]() {
if (m_slideOffset == 0 && m_view->inEditMode()) {
syncGeometry();
}
});
connect(m_view, &QQuickWindow::xChanged, this, &Positioner::validateDockGeometry);
connect(m_view, &QQuickWindow::yChanged, this, &Positioner::validateDockGeometry);
connect(m_view, &QQuickWindow::widthChanged, this, &Positioner::validateDockGeometry);
@ -167,15 +166,11 @@ void Positioner::init()
});
connect(m_view, &Latte::View::screenEdgeMarginEnabledChanged, this, [&]() {
if (m_view->inEditMode() ) {
syncGeometry();
}
syncGeometry();
});
connect(m_view, &Latte::View::screenEdgeMarginChanged, this, [&]() {
if (m_view->screenEdgeMarginEnabled() && m_view->inEditMode()) {
syncGeometry();
}
syncGeometry();
});
connect(m_view->effects(), &Latte::ViewPart::Effects::drawShadowsChanged, this, [&]() {
@ -408,7 +403,9 @@ void Positioner::syncGeometry()
qDebug() << "syncGeometry() called...";
immediateSyncGeometry();
if (!m_syncGeometryTimer.isActive()) {
m_syncGeometryTimer.start();
}
}
void Positioner::immediateSyncGeometry()

2
app/view/positioner.h
View File

@ -175,7 +175,7 @@ private:
QString m_screenToFollowId;
QPointer<QScreen> m_screenToFollow;
QTimer m_screenSyncTimer;
QTimer m_syncGeometryTimer;
QTimer m_validateGeometryTimer;
//!used at sliding out/in animation

2
app/view/view.cpp
View File

@ -980,6 +980,8 @@ void View::setScreenEdgeMargin(int margin)
return;
}
m_screenEdgeMargin = margin;
emit screenEdgeMarginChanged();
}

2
containment/package/contents/ui/VisibilityManager.qml
View File

@ -216,7 +216,7 @@ Item{
target: latteView
property: "screenEdgeMargin"
when: latteView
value: Math.max(0, plasmoid.configuration.screenEdgeMargin)
value: plasmoid.configuration.shrinkThickMargins ? 0 :Math.max(0, plasmoid.configuration.screenEdgeMargin)
}
Binding{