From a911b03e3d688c82ce200120e0c4884cca7edd25 Mon Sep 17 00:00:00 2001 From: Tom Beckmann Date: Sat, 2 Jun 2012 00:08:15 +0200 Subject: [PATCH] Fixed moving windows between workspace, added temporary shortcut for workspace view --- src/Main.vala | 12 ++++++++---- src/Settings.vala | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Main.vala b/src/Main.vala index 4b9d92b1..9c949902 100644 --- a/src/Main.vala +++ b/src/Main.vala @@ -81,6 +81,10 @@ namespace Gala } catch (Error e) { warning (e.message); } }); + KeyBinding.set_custom_handler ("show-desktop", () => { + workspace_view.show (); + }); + KeyBinding.set_custom_handler ("switch-windows", winswitcher.handle_switch_windows); KeyBinding.set_custom_handler ("switch-windows-backward", winswitcher.handle_switch_windows); @@ -89,10 +93,10 @@ namespace Gala KeyBinding.set_custom_handler ("switch-to-workspace-left", wswitcher.handle_switch_to_workspace); KeyBinding.set_custom_handler ("switch-to-workspace-right", wswitcher.handle_switch_to_workspace); - KeyBinding.set_custom_handler ("move-to-workspace-left", () => {}); - KeyBinding.set_custom_handler ("move-to-workspace-right", () => {}); - KeyBinding.set_custom_handler ("move-to-workspace-up", (d, s, w) => move_window (w, true) ); - KeyBinding.set_custom_handler ("move-to-workspace-down", (d, s, w) => move_window (w, false) ); + KeyBinding.set_custom_handler ("move-to-workspace-up", () => {}); + KeyBinding.set_custom_handler ("move-to-workspace-down", () => {}); + KeyBinding.set_custom_handler ("move-to-workspace-left", (d, s, w) => move_window (w, true) ); + KeyBinding.set_custom_handler ("move-to-workspace-right", (d, s, w) => move_window (w, false) ); /*shadows*/ ShadowFactory.get_default ().set_params ("normal", true, {30, -1, 0, 35, 120}); diff --git a/src/Settings.vala b/src/Settings.vala index 0847ccfe..bd274fd1 100644 --- a/src/Settings.vala +++ b/src/Settings.vala @@ -20,7 +20,7 @@ namespace Gala public class Settings : Granite.Services.Settings { public bool attach_modal_dialogs { get; set; } - public string[] button_layout { get; set; } + public string button_layout { get; set; } public bool edge_tiling { get; set; } public bool enable_animations { get; set; } public string panel_main_menu_action { get; set; }