From f92c7858edaa8e13d66ca29eb7bff6f7fcb64e91 Mon Sep 17 00:00:00 2001 From: skyjake Date: Sat, 10 Aug 2013 14:39:14 +0300 Subject: [PATCH] UI|Client|ButtonWidget: Adjusted button down state scaling --- doomsday/client/src/ui/widgets/buttonwidget.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/doomsday/client/src/ui/widgets/buttonwidget.cpp b/doomsday/client/src/ui/widgets/buttonwidget.cpp index ffa4a478e5..38e199257d 100644 --- a/doomsday/client/src/ui/widgets/buttonwidget.cpp +++ b/doomsday/client/src/ui/widgets/buttonwidget.cpp @@ -65,7 +65,7 @@ DENG2_OBSERVES(Action, Triggered) break; case Down: - scale.setValue(.9f); + scale.setValue(.95f); frameOpacity.setValue(0); break; } @@ -172,9 +172,16 @@ bool ButtonWidget::handleEvent(Event const &event) case MouseClickFinished: d->setState(Up); - if(!d->action.isNull() && hitTest(mouse.pos())) + d->updateHover(mouse.pos()); + if(hitTest(mouse.pos())) { - d->action->trigger(); + // Notify. + DENG2_FOR_AUDIENCE(Press, i) i->buttonPressed(*this); + + if(!d->action.isNull()) + { + d->action->trigger(); + } } return true;