Merge pull request #7749 from petehuang/sync-fullscreen-shortcuts

tacaswell · tacaswell · commit f964bcdf58ce · 2017-01-07T17:32:43.000-05:00
DOC: Sync keyboard shortcuts for fullscreen toggle
diff --git a/doc/users/navigation_toolbar.rst b/doc/users/navigation_toolbar.rst
@@ -93,7 +93,7 @@ Forward                            **v** or **right arrow**
 Pan/Zoom                           **p**
 Zoom-to-rect                       **o**
 Save                               **ctrl** + **s**
-Toggle fullscreen                  **ctrl** + **f**
+Toggle fullscreen                  **f** or **ctrl** + **f**
 Close plot                         **ctrl** + **w**
 Constrain pan/zoom to x axis       hold **x** when panning/zooming with mouse
 Constrain pan/zoom to y axis       hold **y** when panning/zooming with mouse
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2496,7 +2496,7 @@ def key_press_handler(event, canvas, toolbar=None):
     toggle_xscale_keys = rcParams['keymap.xscale']
     all = rcParams['keymap.all_axes']
 
-    # toggle fullscreen mode (default key 'f')
+    # toggle fullscreen mode ('f', 'ctrl + f')
     if event.key in fullscreen_keys:
         try:
             canvas.manager.full_screen_toggle()
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -587,7 +587,7 @@ backend      : $TEMPLATE_BACKEND
 # Customize these settings according to your needs.
 # Leave the field(s) empty if you don't need a key-map. (i.e., fullscreen : '')
 
-#keymap.fullscreen : f               # toggling
+#keymap.fullscreen : f, ctrl+f       # toggling
 #keymap.home : h, r, home            # home or reset mnemonic
 #keymap.back : left, c, backspace    # forward / backward keys to enable
 #keymap.forward : right, v           #   left handed quick navigation
