Merge lp:~elementary-os/elementaryos/default-settings-maximize into lp:~elementary-os/elementaryos/default-settings-loki

Proposed by Cassidy James Blaede
Status: Merged
Approved by: Danielle Foré
Approved revision: 217
Merged at revision: 215
Proposed branch: lp:~elementary-os/elementaryos/default-settings-maximize
Merge into: lp:~elementary-os/elementaryos/default-settings-loki
Diff against target: 19 lines (+3/-0)
1 file modified
debian/elementary-default-settings.gsettings-override (+3/-0)
To merge this branch: bzr merge lp:~elementary-os/elementaryos/default-settings-maximize
Reviewer Review Type Date Requested Status
elementary OS team Pending
Review via email: mp+319610@code.launchpad.net

Commit message

Cleans up maximize and unmaximize defaults to fix bug 1566546.

Description of the change

Cleans up maximize and unmaximize defaults to fix bug 1566546.

To post a comment you must log in.
216. By Cassidy James Blaede

Revert the deprecation of unmaximize because small diff best diff

217. By Cassidy James Blaede

Remove periods I accidentally added

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/elementary-default-settings.gsettings-override'
--- debian/elementary-default-settings.gsettings-override 2017-01-25 10:26:24 +0000
+++ debian/elementary-default-settings.gsettings-override 2017-03-10 19:27:53 +0000
@@ -36,6 +36,8 @@
36lock-enabled=false36lock-enabled=false
3737
38[org.gnome.desktop.wm.keybindings]38[org.gnome.desktop.wm.keybindings]
39# defaults to <Super>Up, replaced by toggle below, so we need to clear it here
40maximize=[]
39move-to-workspace-1=['<Super><Shift>1','<Super><Alt>1']41move-to-workspace-1=['<Super><Shift>1','<Super><Alt>1']
40move-to-workspace-2=['<Super><Shift>2','<Super><Alt>2']42move-to-workspace-2=['<Super><Shift>2','<Super><Alt>2']
41move-to-workspace-3=['<Super><Shift>3','<Super><Alt>3']43move-to-workspace-3=['<Super><Shift>3','<Super><Alt>3']
@@ -71,6 +73,7 @@
71switch-to-workspace-9=['<Super>9']73switch-to-workspace-9=['<Super>9']
72switch-windows=['<Alt>Tab']74switch-windows=['<Alt>Tab']
73switch-windows-backward=['<Alt><Shift>Tab']75switch-windows-backward=['<Alt><Shift>Tab']
76toggle-maximized=['<Super>Up']
74# defaults to <Super>Down used above, so we need to override it77# defaults to <Super>Down used above, so we need to override it
75unmaximize=['<Alt>F5']78unmaximize=['<Alt>F5']
7679

Subscribers

People subscribed via source and target branches

to all changes: