diff options
| author | Chris Townsend <christopher.townsend@canonical.com> | 2013-12-04 14:42:43 -0500 |
|---|---|---|
| committer | Chris Townsend <christopher.townsend@canonical.com> | 2013-12-04 14:42:43 -0500 |
| commit | bb0cedc81c063b014ac36ccdf1dc6a5c406f6422 (patch) | |
| tree | 55fe5fcb9d1746488600044ca4353a9e4a2c77c5 /shortcuts | |
| parent | 6d49fbdbda562ac3b965910d0328b6a21fd49bf5 (diff) | |
* Revert most of lp:unity revno. 3509 as the Compiz Grid plugin is a better place to handle the Ctrl-Super-Left/Right shortcuts.
* Expanded autopilot test to check for correct window placement when semi-maximizing and restoring. Fixes LP: #1251777 (bzr r3606.1.1)
Diffstat (limited to 'shortcuts')
| -rw-r--r-- | shortcuts/CompizShortcutModeller.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/shortcuts/CompizShortcutModeller.cpp b/shortcuts/CompizShortcutModeller.cpp index b77966a70..7149ac628 100644 --- a/shortcuts/CompizShortcutModeller.cpp +++ b/shortcuts/CompizShortcutModeller.cpp @@ -32,6 +32,7 @@ namespace // Compiz' plug-in names const std::string CORE_PLUGIN_NAME = "core"; const std::string EXPO_PLUGIN_NAME = "expo"; + const std::string GRID_PLUGIN_NAME = "grid"; const std::string MOVE_PLUGIN_NAME = "move"; const std::string RESIZE_PLUGIN_NAME = "resize"; const std::string SCALE_PLUGIN_NAME = "scale"; @@ -48,6 +49,9 @@ namespace // Compiz Expo Options const std::string EXPO_OPTION_EXPO_KEY = "expo_key"; + // Compiz Grid Options + const std::string GRID_OPTION_LEFT_MAXIMIZE = "left_maximize"; + // Compiz Move Options const std::string MOVE_OPTION_INITIATE_BUTTON = "initiate_button"; @@ -65,10 +69,6 @@ namespace const std::string UNITYSHELL_OPTION_PANEL_FIRST_MENU = "panel_first_menu"; const std::string UNITYSHELL_OPTION_ALT_TAB_FORWARD = "alt_tab_forward"; const std::string UNITYSHELL_OPTION_ALT_TAB_NEXT_WINDOW = "alt_tab_next_window"; - const std::string UNITYSHELL_OPTION_MAXIMIZE = "window_maximize"; - const std::string UNITYSHELL_OPTION_LEFT_MAXIMIZE = "window_left_maximize"; - const std::string UNITYSHELL_OPTION_RIGHT_MAXIMIZE = "window_right_maximize"; - const std::string UNITYSHELL_OPTION_RESTORE_MINIMIZE = "window_restore_minimize"; // Compiz Wall Options const std::string WALL_OPTION_LEFT_KEY = "left_key"; @@ -315,8 +315,8 @@ void CompizModeller::AddWindowsHints(std::list<shortcut::AbstractHint::Ptr> &hin hints.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" or Right"), _("Semi-maximise the current window."), shortcut::OptionType::COMPIZ_KEY, - UNITYSHELL_PLUGIN_NAME, - UNITYSHELL_OPTION_LEFT_MAXIMIZE)); + GRID_PLUGIN_NAME, + GRID_OPTION_LEFT_MAXIMIZE)); hints.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Closes the current window."), |