168492376
/
qt-material-widgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak menu animation

This commit is contained in:
laserpants 2016-04-28 10:34:25 +03:00
parent 15c970ff51
commit e8c1b06aa4
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/iconmenu.cpp
View File

@ -32,11 +32,11 @@ IconMenu::IconMenu(const QIcon &icon, QWidget *parent)
_animation->setPropertyName("progress"); _animation->setPropertyName("progress");
_animation->setTargetObject(this); _animation->setTargetObject(this);
_animation->setDuration(200); _animation->setDuration(340);
_animation->setStartValue(1); _animation->setStartValue(1);
_animation->setEndValue(0); _animation->setEndValue(0);
_animation->setEasingCurve(QEasingCurve::InCurve); _animation->setEasingCurve(QEasingCurve::InBounce);
_menu->hide(); _menu->hide();
@ -85,6 +85,12 @@ void IconMenu::setOverlayParent(QWidget *parent)
void IconMenu::toggleMenu() void IconMenu::toggleMenu()
{ {
if (QAbstractAnimation::Running != _animation->state()) {
_animation->setEasingCurve(_menuVisible
? QEasingCurve::OutCubic
: QEasingCurve::InBounce);
}
_animation->setDirection(_menuVisible _animation->setDirection(_menuVisible
? QAbstractAnimation::Forward ? QAbstractAnimation::Forward
: QAbstractAnimation::Backward); : QAbstractAnimation::Backward);
@ -131,9 +137,7 @@ void IconMenu::updateOverlayGeometry()
const QPoint pos = _menuPos; const QPoint pos = _menuPos;
const QSize size = _menu->layout()->sizeHint(); const QSize size = _menu->layout()->sizeHint();
if (QAbstractAnimation::Running == _animation->state()) { if (QAbstractAnimation::Running == _animation->state()) {
const QSize menuSize = size*(_progress*0.4 + 0.6); _menu->setGeometry(QRect(pos, size*_progress));
_menu->setGeometry(QRect(pos, menuSize));
_menu->layout()->setGeometry(QRect(0, 0, menuSize.width(), size.height()*_progress));
} else { } else {
_menu->setGeometry(QRect(pos, size)); _menu->setGeometry(QRect(pos, size));
} }

3
components/toggle.cpp
View File

@ -56,12 +56,15 @@ bool Thumb::eventFilter(QObject *obj, QEvent *event)
void Thumb::mouseReleaseEvent(QMouseEvent *event) void Thumb::mouseReleaseEvent(QMouseEvent *event)
{ {
const bool checked = _toggle->isChecked(); const bool checked = _toggle->isChecked();
_toggle->setChecked(!checked); _toggle->setChecked(!checked);
if (QAbstractAnimation::Running != _animation->state()) { if (QAbstractAnimation::Running != _animation->state()) {
_animation->setEasingCurve(checked _animation->setEasingCurve(checked
? QEasingCurve::OutCubic ? QEasingCurve::OutCubic
: QEasingCurve::InCubic); : QEasingCurve::InCubic);
} }
_animation->setDirection(checked _animation->setDirection(checked
? QAbstractAnimation::Forward ? QAbstractAnimation::Forward
: QAbstractAnimation::Backward); : QAbstractAnimation::Backward);