diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2014-03-29 10:06:55 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2014-04-01 11:15:06 +0200 |
| commit | cc17690cbe8f19ce9d095612abd50ee96cd8a9a0 (patch) | |
| tree | 592ef98c7a29d61694e28aaab3b212675398230a | |
| parent | e0e9d54ecf63004a87bab57071e926cb95b0179f (diff) | |
| download | graynard-cc17690cbe8f19ce9d095612abd50ee96cd8a9a0.tar.gz graynard-cc17690cbe8f19ce9d095612abd50ee96cd8a9a0.zip | |
Revert "gtk-shell: add hack to always keep app launcher onscreen"
There is a better hack in weston now, which means we don't need to
keep this surface onscreen.
This reverts commit e629806944f19ddccdceb75ccff095b06f2ab06c.
| -rw-r--r-- | shell/maynard.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/shell/maynard.c b/shell/maynard.c index 6c08ec8..e5d60ea 100644 --- a/shell/maynard.c +++ b/shell/maynard.c @@ -142,8 +142,7 @@ desktop_shell_configure(void *data, shell_helper_move_surface(desktop->helper, desktop->launcher_grid->surface, - /* TODO: massive hack so window is always onscreen */ - - grid_width + 1, + - grid_width, ((height - window_height) / 2) + MAYNARD_CLOCK_HEIGHT); desktop_shell_desktop_ready(desktop->shell); @@ -187,8 +186,7 @@ launcher_grid_toggle (GtkWidget *widget, struct desktop *desktop) shell_helper_slide_surface(desktop->helper, desktop->launcher_grid->surface, - /* TODO: massive hack so window is always onscreen */ - width + MAYNARD_PANEL_WIDTH - 1, 0); + width + MAYNARD_PANEL_WIDTH, 0); } desktop->grid_visible = !desktop->grid_visible; |