window.c: Set focus widget before calling enter handler
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 5 Jun 2012 03:36:32 +0000 (23:36 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 5 Jun 2012 03:36:32 +0000 (23:36 -0400)
This way input_get_focus_widget() returns the right widget when
called from the enter handler.

clients/window.c

index e27f3d3..314e5e9 100644 (file)
@@ -1725,10 +1725,10 @@ input_set_focus_widget(struct input *input, struct widget *focus,
                widget = focus;
                if (input->grab)
                        widget = input->grab;
+               input->focus_widget = focus;
                if (widget->enter_handler)
                        pointer = widget->enter_handler(focus, input, x, y,
                                                        widget->user_data);
-               input->focus_widget = focus;
 
                input_set_pointer_image(input, pointer);
        }