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

Only visibilityManager can call mustBeHide/Shown

Browse Source
This commit is contained in:
Johan Smith Agudelo Rodriguez 2017-03-12 13:09:38 -05:00
parent a014eadd40
commit af8f844bc6
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/visibilitymanager.cpp
View File

@ -48,13 +48,13 @@ VisibilityManagerPrivate::VisibilityManagerPrivate(PlasmaQuick::ContainmentView
connect(&timerShow, &QTimer::timeout, this, [this]() {
if (isHidden) {
// qDebug() << "must be shown";
emit this->q->mustBeShown();
emit this->q->mustBeShown(VisibilityManager::QPrivateSignal{});
}
});
connect(&timerHide, &QTimer::timeout, this, [this]() {
if (!blockHiding && !isHidden && !dragEnter) {
// qDebug() << "must be hide";
emit this->q->mustBeHide();
emit this->q->mustBeHide(VisibilityManager::QPrivateSignal{});
}
});
wm->setDockExtraFlags(*view);
@ -218,7 +218,7 @@ void VisibilityManagerPrivate::setBlockHiding(bool blockHiding)
if (isHidden) {
isHidden = false;
emit q->isHiddenChanged();
emit q->mustBeShown();
emit q->mustBeShown(VisibilityManager::QPrivateSignal{});
}
} else {
updateHiddenState();
@ -255,7 +255,7 @@ inline void VisibilityManagerPrivate::raiseDock(bool raise)
if (hideNow) {
hideNow = false;
emit q->mustBeHide();
emit q->mustBeHide(VisibilityManager::QPrivateSignal{});
} else if (!timerHide.isActive())
timerHide.start();
}
@ -271,7 +271,7 @@ void VisibilityManagerPrivate::raiseDockTemporarily()
timerShow.stop();
if (isHidden)
emit q->mustBeShown();
emit q->mustBeShown(VisibilityManager::QPrivateSignal{});
QTimer::singleShot(qBound(1800, 2 * timerHide.interval(), 3000), this, [&]() {
raiseTemporarily = false;
@ -435,9 +435,9 @@ inline void VisibilityManagerPrivate::restoreConfig()
emit q->timerHideChanged();
if (mode == Dock::AlwaysVisible) {
setMode(mode);
setMode(mode);
} else {
QTimer::singleShot(3000, this, [&, mode]() {
QTimer::singleShot(5000, this, [&, mode]() {
setMode(mode);
});
setRaiseOnDesktop(config.readEntry("raiseOnDesktopChange", false));
@ -480,7 +480,9 @@ bool VisibilityManagerPrivate::event(QEvent *ev)
case QEvent::DragEnter:
dragEnter = true;
emit q->mustBeShown();
if (isHidden)
emit q->mustBeShown(VisibilityManager::QPrivateSignal{});
break;
case QEvent::DragLeave:

6
app/visibilitymanager.h
View File

@ -73,8 +73,8 @@ public:
void setTimerHide(int msec);
signals:
void mustBeShown();
void mustBeHide();
void mustBeShown(QPrivateSignal);
void mustBeHide(QPrivateSignal);
void modeChanged();
void raiseOnDesktopChanged();
@ -87,6 +87,8 @@ signals:
private:
VisibilityManagerPrivate *const d;
friend class VisibilityManagerPrivate;
};
}

2
app/visibilitymanager_p.h
View File

@ -66,7 +66,7 @@ public:
QTimer timerHide;
QTimer timerCheckWindows;
QRect dockGeometry;
bool isHidden{true};
bool isHidden{false};
bool dragEnter{false};
bool blockHiding{false};
bool containsMouse{false};