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

code formatted

Browse Source
v0.6
audoban 8 years ago committed by Michail Vourlakos
parent 170a2eec15
commit f701864a69
10 changed files with 66 additions and 56 deletions
Show Stats Download Patch File Download Diff File

3
app/iconitem.h
Unescape Escape View File

@ -141,8 +141,7 @@ private:
bool m_textureChanged; bool m_textureChanged;
bool m_sizeChanged; bool m_sizeChanged;
}; };
} }
#endif // ICONITEM_H #endif // ICONITEM_H

13
app/visibilitymanager.cpp
Unescape Escape View File

@ -271,13 +271,25 @@ bool VisibilityManagerPrivate::event(QEvent *ev)
containsMouse = true; containsMouse = true;
emit q->containsMouseChanged(); emit q->containsMouseChanged();
<<< <<< < HEAD
raiseDock(true); raiseDock(true);
== == == =
if (mode == Dock::AutoHide)
raiseDock(true);
>>> >>> > code formatted
} else if (ev->type() == QEvent::Leave && containsMouse) { } else if (ev->type() == QEvent::Leave && containsMouse) {
containsMouse = false; containsMouse = false;
emit q->containsMouseChanged(); emit q->containsMouseChanged();
if (mode == Dock::AutoHide) if (mode == Dock::AutoHide)
raiseDock(false); raiseDock(false);
<<< <<< <HEAD
== == == =
>>>>>>> code formatted
} else if (ev->type() == QEvent::Show) { } else if (ev->type() == QEvent::Show) {
wm->setDockDefaultFlags(); wm->setDockDefaultFlags();
} }
@ -350,4 +362,3 @@ void VisibilityManager::updateDockGeometry(const QRect &geometry)
//! END: VisibilityManager implementation //! END: VisibilityManager implementation
} }

Write Preview
Loading…
Cancel
Save