diff options
| -rw-r--r-- | desktop-shell/input-panel.c | 2 | ||||
| -rw-r--r-- | desktop-shell/shell.c | 17 | ||||
| -rw-r--r-- | packaging/weston.changes | 4 |
3 files changed, 14 insertions, 9 deletions
diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c index c08a403f..12fe686f 100644 --- a/desktop-shell/input-panel.c +++ b/desktop-shell/input-panel.c @@ -63,7 +63,7 @@ show_input_panels(struct wl_listener *listener, void *data) shell->showing_input_panels = true; if (!shell->locked) - wl_list_insert(&shell->panel_layer.link, + wl_list_insert(&shell->compositor->cursor_layer.link, &shell->input_panel_layer.link); wl_list_for_each_safe(ipsurf, next, diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 962dde02..8cd4401c 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -84,9 +84,9 @@ struct ping_timer { * in the following order (top-most first): * • Lock layer (only ever displayed on its own) * • Cursor layer + * • Input panel layer * • Fullscreen layer * • Panel layer - * • Input panel layer * • Workspace layers * • Background layer * @@ -3800,18 +3800,19 @@ resume_desktop(struct desktop_shell *shell) terminate_screensaver(shell); wl_list_remove(&shell->lock_layer.link); - wl_list_insert(&shell->compositor->cursor_layer.link, - &shell->fullscreen_layer.link); - wl_list_insert(&shell->fullscreen_layer.link, - &shell->panel_layer.link); if (shell->showing_input_panels) { - wl_list_insert(&shell->panel_layer.link, + wl_list_insert(&shell->compositor->cursor_layer.link, &shell->input_panel_layer.link); wl_list_insert(&shell->input_panel_layer.link, - &ws->layer.link); + &shell->fullscreen_layer.link); } else { - wl_list_insert(&shell->panel_layer.link, &ws->layer.link); + wl_list_insert(&shell->compositor->cursor_layer.link, + &shell->fullscreen_layer.link); } + wl_list_insert(&shell->fullscreen_layer.link, + &shell->panel_layer.link); + wl_list_insert(&shell->panel_layer.link, + &ws->layer.link), restore_focus_state(shell, get_current_workspace(shell)); diff --git a/packaging/weston.changes b/packaging/weston.changes index 6a35d430..df6408d0 100644 --- a/packaging/weston.changes +++ b/packaging/weston.changes @@ -1,3 +1,7 @@ +* Fri Mar 07 2014 Ossama Othman <ossama.othman@intel.com> accepted/tizen/mobile/20140306.215156@0a8cc4e +- shell: position input panel layer above fullscreen layer +- packaging: add weston-editor & weston-subsurfaces clients. + * Wed Mar 05 2014 Ossama Othman <ossama.othman@intel.com> accepted/tizen/mobile/20140227.071827@0aaa2e4 - toytoolkit: totally switch to xdg-shell protocol - compositor: use Mod-Tab to show/raise minimized surfaces |