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

fix #330, visibility mode and options

Browse Source 
Visibility doesn't load when switch to session
This commit is contained in:
audoban 2017-04-02 00:23:47 -05:00
parent abbb92569f
commit 4c412c4e71
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/visibilitymanager.cpp
View File

@ -170,6 +170,7 @@ inline void VisibilityManagerPrivate::setMode(Dock::Visibility mode)
break;
}
view->containment()->config().writeEntry("visibility", static_cast<int>(mode));
emit q->modeChanged();
}
@ -428,7 +429,7 @@ inline void VisibilityManagerPrivate::saveConfig()
return;
auto config = view->containment()->config();
config.writeEntry("visibility", static_cast<int>(mode));
config.writeEntry("timerShow", timerShow.interval());
config.writeEntry("timerHide", timerHide.interval());
config.writeEntry("raiseOnDesktopChange", raiseOnDesktopChange);
@ -444,18 +445,22 @@ inline void VisibilityManagerPrivate::restoreConfig()
auto config = view->containment()->config();
timerShow.setInterval(config.readEntry("timerShow", 200));
timerHide.setInterval(config.readEntry("timerHide", 700));
auto mode = static_cast<Dock::Visibility>(config.readEntry("visibility", static_cast<int>(Dock::DodgeActive)));
emit q->timerShowChanged();
emit q->timerHideChanged();
setRaiseOnDesktop(config.readEntry("raiseOnDesktopChange", false));
setRaiseOnActivity(config.readEntry("raiseOnActivityChange", false));
if (mode == Dock::AlwaysVisible) {
setMode(mode);
auto mode = [&]() {
return static_cast<Dock::Visibility>(view->containment()->config()
.readEntry("visibility", static_cast<int>(Dock::DodgeActive)));
};
if (mode() == Dock::AlwaysVisible) {
setMode(Dock::AlwaysVisible);
} else {
QTimer::singleShot(5000, this, [ &, mode]() {
setMode(mode);
QTimer::singleShot(5000, this, [&, mode]() {
setMode(mode());
});
}
@ -527,6 +532,9 @@ VisibilityManager::~VisibilityManager()
Dock::Visibility VisibilityManager::mode() const
{
if (d->mode == Dock::None)
return static_cast<Dock::Visibility>(d->view->containment()->config().readEntry("visibility", -1));
return d->mode;
}

2
shell/contents/configuration/TweaksConfig.qml
View File

@ -138,6 +138,7 @@ PlasmaComponents.Page {
Layout.leftMargin: units.smallSpacing * 2
text: i18n("Raise dock on desktop change")
checked: dock.visibility.raiseOnDesktop
enabled: dock.visibility.mode !== Latte.Dock.AlwaysVisible
onClicked: {
dock.visibility.raiseOnDesktop = checked
@ -148,6 +149,7 @@ PlasmaComponents.Page {
Layout.leftMargin: units.smallSpacing * 2
text: i18n("Raise dock on activity change")
checked: dock.visibility.raiseOnActivity
enabled: dock.visibility.mode !== Latte.Dock.AlwaysVisible
onClicked: {
dock.visibility.raiseOnActivity = checked