awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

screen_client_moveto: only emit property::screen if it changed 

While debugging #331, I have noticed that the call to `client_resize`
might have changed the screen (and emitted the signal) already, via
a call to `screen_client_moveto` with `doresize=False`.

Closes https://github.com/awesomeWM/awesome/pull/332.
This commit is contained in:
Daniel Hahler 2015-07-21 15:31:18 +02:00
parent 6d323e7c04
commit d5e365804c
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
objects/screen.c
View File

@ -445,14 +445,18 @@ screen_client_moveto(client_t *c, screen_t *new_screen, bool doresize)
/* move / resize the client */
client_resize(c, new_geometry, false);
/* emit signal */
luaA_object_push(L, c);
if(old_screen_idx != 0)
lua_pushinteger(L, old_screen_idx);
else
lua_pushnil(L);
luaA_object_emit_signal(L, -2, "property::screen", 1);
lua_pop(L, 1);
/* Emit signal, but only in case the call to client_resize had not changed
* it already. */
if(old_screen != c->screen)
{
luaA_object_push(L, c);
if(old_screen_idx != 0)
lua_pushinteger(L, old_screen_idx);
else
lua_pushnil(L);
luaA_object_emit_signal(L, -2, "property::screen", 1);
lua_pop(L, 1);
}
if(had_focus)
client_focus(c);