1 files changed, 8 insertions, 3 deletions

diff --git a/src/ui/widget.c b/src/ui/widget.c
index b9fb12b9..2a889683 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -424,9 +424,9 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
             return iTrue;
         }
     }
-    else if (d->flags & commandOnClick_WidgetFlag && (ev->type == SDL_MOUSEBUTTONDOWN ||
-                                                 ev->type == SDL_MOUSEBUTTONUP) &&
-        contains_Widget(d, init_I2(ev->button.x, ev->button.y))) {
+    else if (d->flags & commandOnClick_WidgetFlag &&
+             (ev->type == SDL_MOUSEBUTTONDOWN || ev->type == SDL_MOUSEBUTTONUP) &&
+             (mouseGrab_Widget() == d || contains_Widget(d, init_I2(ev->button.x, ev->button.y)))) {
         postCommand_Widget(d,
                            "mouse.clicked arg:%d button:%d coord:%d %d",
                            ev->type == SDL_MOUSEBUTTONDOWN ? 1 : 0,
@@ -435,6 +435,11 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
                            ev->button.y);
         return iTrue;
     }
+    else if (d->flags & commandOnClick_WidgetFlag &&
+             mouseGrab_Widget() == d && ev->type == SDL_MOUSEMOTION) {
+        postCommand_Widget(d, "mouse.moved coord:%d %d", ev->motion.x, ev->motion.y);
+        return iTrue;
+    }
     switch (ev->type) {
         case SDL_USEREVENT: {
             if (ev->user.code == command_UserEventCode && d->commandHandler &&