github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

view:update move to layout

Browse Source 
--update to new infrastructure that is able to
switch view location by combining multiple
changes at the same time
work/spdx
Michail Vourlakos 4 years ago
parent cc4f901cf1
commit 92f12b6f63
5 changed files with 81 additions and 104 deletions
Show Stats Download Patch File Download Diff File

2
app/lattecorona.cpp
Unescape Escape View File

@ -1206,7 +1206,7 @@ void Corona::moveViewToLayout(const uint &containmentId, const QString &layoutNa
{
auto view = m_layoutsManager->synchronizer()->viewForContainment((int)containmentId);
if (view && !layoutName.isEmpty() && view->layout()->name() != layoutName) {
view->positioner()->hideDockDuringMovingToLayout(layoutName);
view->positioner()->setNextLocation(layoutName, "", Plasma::Types::Floating, Latte::Types::NoneAlignment);
}
}

155
app/view/positioner.cpp
Unescape Escape View File

@ -120,9 +120,6 @@ void Positioner::init()
connect(this, &Positioner::showingAfterRelocationFinished, this, &Positioner::updateInRelocationAnimation);
connect(this, &Positioner::showingAfterRelocationFinished, this, &Positioner::syncLatteViews);
connect(this, &Positioner::hideDockDuringMovingToLayoutStarted, this, &Positioner::updateInRelocationAnimation);
connect(this, &Positioner::showDockAfterMovingToLayoutFinished, this, &Positioner::updateInRelocationAnimation);
connect(this, &Positioner::showDockAfterMovingToLayoutFinished, this, &Positioner::syncLatteViews);
connect(m_view, &Latte::View::onPrimaryChanged, this, &Positioner::syncLatteViews);
connect(this, &Positioner::inSlideAnimationChanged, this, [&]() {
@ -196,6 +193,12 @@ void Positioner::init()
syncGeometry();
});
connect(m_view, &View::layoutChanged, this, [&]() {
if (m_nextLayoutName.isEmpty() && m_view->layout() && m_view->formFactor() == Plasma::Types::Vertical) {
syncGeometry();
}
});
connect(m_view->effects(), &Latte::ViewPart::Effects::drawShadowsChanged, this, [&]() {
if (!m_view->behaveAsPlasmaPanel()) {
syncGeometry();
@ -862,14 +865,14 @@ void Positioner::initSignalingForLocationChangeSliding()
{
connect(this, &Positioner::hidingForRelocationStarted, this, &Positioner::onHideWindowsForSlidingOut);
//! signals to handle the sliding-in/out during location changes
//! SCREEN_EDGE
connect(m_view, &View::locationChanged, this, [&]() {
if (m_nextScreenEdge != Plasma::Types::Floating) {
bool isrelocationlastevent = isLastHidingRelocationEvent();
immediateSyncGeometry();
m_nextScreenEdge = Plasma::Types::Floating;
//! make sure that View has been repositioned properly in next screen edge and show view afterwards
if (isrelocationlastevent) {
QTimer::singleShot(100, [this]() {
m_view->effects()->setAnimationsBlocked(false);
@ -885,17 +888,17 @@ void Positioner::initSignalingForLocationChangeSliding()
}
});
//! signals to handle the sliding-in/out during screen changes
//! SCREEN
connect(m_view, &QQuickView::screenChanged, this, [&]() {
if (m_nextScreen
&& m_nextScreen == m_view->screen()
&& m_nextScreen->geometry().contains(m_view->geometry().center())) {
bool isrelocationlastevent = isLastHidingRelocationEvent();
//! make sure that View has been repositioned properly in next screen and show view afterwards
m_nextScreen = nullptr;
m_nextScreenName = "";
//! make sure that View has been repositioned properly in next screen and show view afterwards
if (isrelocationlastevent) {
QTimer::singleShot(100, [this]() {
m_view->effects()->setAnimationsBlocked(false);
@ -911,47 +914,39 @@ void Positioner::initSignalingForLocationChangeSliding()
}
});
//! signals to handle the sliding-in/out during moving to another layout
connect(this, &Positioner::hideDockDuringMovingToLayoutStarted, this, &Positioner::onHideWindowsForSlidingOut);
//! LAYOUT
connect(m_view, &View::layoutChanged, this, [&]() {
if (!m_nextLayout.isEmpty() && m_view->layout()) {
m_nextLayout = "";
QTimer::singleShot(100, [this]() {
m_view->effects()->setAnimationsBlocked(false);
emit showDockAfterMovingToLayoutFinished();
m_view->showSettingsWindow();
emit edgeChanged();
});
} else {
if (m_view->formFactor() == Plasma::Types::Vertical) {
syncGeometry();
}
}
});
if (!m_nextLayoutName.isEmpty() && m_view->layout()) {
bool isrelocationlastevent = isLastHidingRelocationEvent();
m_nextLayoutName = "";
//! ---- both cases ---- !//
//! this is used for both location and screen change cases, this signal
//! is send when the sliding-out animation has finished
/* connect(this, &Positioner::hideDockDuringLocationChangeFinished, this, [&]() {
m_view->effects()->setAnimationsBlocked(true);
//! make sure that View has been repositioned properly in next layout and show view afterwards
if (isrelocationlastevent) {
QTimer::singleShot(100, [this]() {
m_view->effects()->setAnimationsBlocked(false);
emit showingAfterRelocationFinished();
emit edgeChanged();
if (m_nextScreenEdge != Plasma::Types::Floating) {
m_view->setLocation(m_nextScreenEdge);
} else if (m_nextScreen) {
setScreenToFollow(m_nextScreen);
} else if (!m_nextLayout.isEmpty()) {
m_view->moveToLayout(m_nextLayout);
if (m_repositionFromViewSettingsWindow) {
m_repositionFromViewSettingsWindow = false;
m_view->showSettingsWindow();
}
});
}
}
});*/
});
//! APPLY CHANGES
connect(this, &Positioner::hidingForRelocationFinished, this, [&]() {
m_view->effects()->setAnimationsBlocked(true);
//! must be called only if relocation is animated
if (m_repositionIsAnimated) {
m_repositionIsAnimated = false;
m_view->effects()->setAnimationsBlocked(true);
}
//! SCREEN_EDGE
if (m_nextScreenEdge != Plasma::Types::Floating) {
m_view->setLocation(m_nextScreenEdge);
//! LAYOUT
if (!m_nextLayoutName.isEmpty()) {
m_view->moveToLayout(m_nextLayoutName);
}
//! SCREEN
@ -971,6 +966,11 @@ void Positioner::initSignalingForLocationChangeSliding()
m_view->setOnPrimary(nextonprimary);
setScreenToFollow(m_nextScreen);
}
//! SCREEN_EDGE
if (m_nextScreenEdge != Plasma::Types::Floating) {
m_view->setLocation(m_nextScreenEdge);
}
});
}
@ -981,7 +981,7 @@ bool Positioner::inLayoutUnloading()
bool Positioner::inRelocationAnimation()
{
return ((m_nextScreenEdge != Plasma::Types::Floating) || (m_nextLayout != "") || m_nextScreen);
return ((m_nextScreenEdge != Plasma::Types::Floating) || !m_nextLayoutName.isEmpty() || !m_nextScreenName.isEmpty());
}
bool Positioner::inSlideAnimation() const
@ -1036,13 +1036,13 @@ void Positioner::setIsStickedOnBottomEdge(bool sticked)
void Positioner::updateInRelocationAnimation()
{
bool inRelocationAnimation = ((m_nextScreenEdge != Plasma::Types::Floating) || (!m_nextLayout.isEmpty()) || m_nextScreen);
bool inrelocationanimation = inRelocationAnimation();
if (m_inRelocationAnimation == inRelocationAnimation) {
if (m_inRelocationAnimation == inrelocationanimation) {
return;
}
m_inRelocationAnimation = inRelocationAnimation;
m_inRelocationAnimation = inrelocationanimation;
emit inRelocationAnimationChanged();
}
@ -1050,7 +1050,7 @@ bool Positioner::isLastHidingRelocationEvent() const
{
int events{0};
if (!m_nextLayout.isEmpty()) {
if (!m_nextLayoutName.isEmpty()) {
events++;
}
@ -1065,43 +1065,28 @@ bool Positioner::isLastHidingRelocationEvent() const
return (events <= 1);
}
void Positioner::hideDockDuringMovingToLayout(QString layoutName)
{
//Check if the new layout is in the same visible workarea
auto layout = m_view->layout();
auto origin = qobject_cast<CentralLayout *>(layout);
auto destination = m_corona->layoutsManager()->synchronizer()->centralLayout(layoutName);
if (!origin || !destination) {
return;
}
//! Needs to be updated; when the next layout is in the same Visible Workarea
//! with the old one changing layouts should be instant
bool inVisibleWorkarea{origin->lastUsedActivity() == destination->lastUsedActivity()};
if (inVisibleWorkarea) {
m_view->moveToLayout(layoutName);
} else {
//! slide-out and move to new layout later
m_nextLayout = layoutName;
emit hideDockDuringMovingToLayoutStarted();
}
}
void Positioner::setNextLocation(const QString layoutName, const QString screenName, int edge, int alignment)
{
bool animated{false};
bool isanimated{false};
bool haschanges{false};
//! SCREEN_EDGE
if (edge != Plasma::Types::Floating) {
if (edge != m_view->location()) {
m_nextScreenEdge = static_cast<Plasma::Types::Location>(edge);
animated = true;
//! LAYOUT
if (!layoutName.isEmpty()) {
auto layout = m_view->layout();
auto origin = qobject_cast<CentralLayout *>(layout);
auto destination = m_corona->layoutsManager()->synchronizer()->centralLayout(layoutName);
if (origin && destination && origin!=destination) {
//! Needs to be updated; when the next layout is in the same Visible Workarea
//! with the old one changing layouts should be instant
bool inVisibleWorkarea{origin->lastUsedActivity() == destination->lastUsedActivity()};
haschanges = true;
m_nextLayoutName = layoutName;
if (!inVisibleWorkarea) {
isanimated = true;
}
}
}
@ -1120,15 +1105,25 @@ void Positioner::setNextLocation(const QString layoutName, const QString screenN
updateContainmentScreen();
} else {
m_nextScreenName = screenName;
animated = true;
isanimated = true;
haschanges = true;
}
}
}
//! SCREEN_EDGE
if (edge != Plasma::Types::Floating) {
if (edge != m_view->location()) {
m_nextScreenEdge = static_cast<Plasma::Types::Location>(edge);
isanimated = true;
haschanges = true;
}
}
m_repositionIsAnimated = isanimated;
m_repositionFromViewSettingsWindow = m_view->settingsWindowIsShown();
if (animated) {
if (isanimated) {
emit hidingForRelocationStarted();
} else if (haschanges){
emit hidingForRelocationFinished();

10
app/view/positioner.h
Unescape Escape View File

@ -96,8 +96,6 @@ public:
Latte::WindowSystem::WindowId trackedWindowId();
public slots:
Q_INVOKABLE void hideDockDuringMovingToLayout(QString layoutName);
Q_INVOKABLE void setNextLocation(const QString layoutName, const QString screenId, int edge, int alignment);
void syncGeometry();
@ -124,11 +122,6 @@ signals:
void hidingForRelocationFinished();
void showingAfterRelocationFinished();
//! Deprecated
void hideDockDuringMovingToLayoutStarted();
void hideDockDuringMovingToLayoutFinished();
void showDockAfterMovingToLayoutFinished();
void onHideWindowsForSlidingOut();
void inRelocationAnimationChanged();
void inSlideAnimationChanged();
@ -190,8 +183,9 @@ private:
//!used for relocation properties group
bool m_repositionFromViewSettingsWindow{false};
bool m_repositionIsAnimated{false};
QString m_nextLayout;
QString m_nextLayoutName;
QString m_nextScreenName;
QScreen *m_nextScreen{nullptr};
Plasma::Types::Location m_nextScreenEdge{Plasma::Types::Floating};

6
app/view/view.cpp
Unescape Escape View File

@ -1255,10 +1255,10 @@ void View::moveToLayout(QString layoutName)
Latte::Corona *latteCorona = qobject_cast<Latte::Corona *>(this->corona());
if (latteCorona && containments.size() > 0) {
Layout::GenericLayout *newLayout = latteCorona->layoutsManager()->synchronizer()->layout(layoutName);
Layout::GenericLayout *newlayout = latteCorona->layoutsManager()->synchronizer()->layout(layoutName);
if (newLayout) {
newLayout->assignToLayout(this, containments);
if (newlayout && newlayout != m_layout) {
newlayout->assignToLayout(this, containments);
}
}
}

12
containment/package/contents/ui/main.qml
Unescape Escape View File

@ -484,10 +484,6 @@ Item {
if (latteView.positioner) {
latteView.positioner.hidingForRelocationStarted.connect(visibilityManager.slotHideDockDuringLocationChange);
latteView.positioner.showingAfterRelocationFinished.connect(visibilityManager.slotShowDockAfterLocationChange);
//! Deprecated
latteView.positioner.hideDockDuringMovingToLayoutStarted.connect(visibilityManager.slotHideDockDuringLocationChange);
latteView.positioner.showDockAfterMovingToLayoutFinished.connect(visibilityManager.slotShowDockAfterLocationChange);
}
if (latteView.visibility) {
@ -504,10 +500,6 @@ Item {
if (latteView.positioner) {
latteView.positioner.hidingForRelocationStarted.connect(visibilityManager.slotHideDockDuringLocationChange);
latteView.positioner.showingAfterRelocationFinished.connect(visibilityManager.slotShowDockAfterLocationChange);
//! Deprecated
latteView.positioner.hideDockDuringMovingToLayoutStarted.connect(visibilityManager.slotHideDockDuringLocationChange);
latteView.positioner.showDockAfterMovingToLayoutFinished.connect(visibilityManager.slotShowDockAfterLocationChange);
}
}
@ -565,10 +557,6 @@ Item {
if (latteView.positioner) {
latteView.positioner.hidingForRelocationStarted.disconnect(visibilityManager.slotHideDockDuringLocationChange);
latteView.positioner.showingAfterRelocationFinished.disconnect(visibilityManager.slotShowDockAfterLocationChange);
// Deprecated
latteView.positioner.hideDockDuringMovingToLayoutStarted.disconnect(visibilityManager.slotHideDockDuringLocationChange);
latteView.positioner.showDockAfterMovingToLayoutFinished.disconnect(visibilityManager.slotShowDockAfterLocationChange);
}
if (latteView.visibility) {

Write Preview
Loading…
Cancel
Save