[Emacs-diffs] trunk r114540: Don't force auto hide dock when hide menu changes.

[Jan D.]

------------------------------------------------------------
revno: 114540
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-10-06 17:59:11 +0200
message:
  Don't force auto hide dock when hide menu changes.
  
  (ns_update_auto_hide_menu_bar): Remove runtime check.
  Don't auto hide dock unless menubar is also auto hidden.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-06 15:53:30 +0000
+++ b/src/ChangeLog     2013-10-06 15:59:11 +0000
@@ -4,6 +4,8 @@
        hide toolbar (Bug#15388).
        (windowDidEnterFullScreen:): If presentation options are zero,
        set them here (Bug#15388).
+       (ns_update_auto_hide_menu_bar): Remove runtime check.
+       Don't auto hide dock unless menubar is also auto hidden.
 
 2013-10-05  Xue Fuqiao  <address@hidden>
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-10-06 15:53:30 +0000
+++ b/src/nsterm.m      2013-10-06 15:59:11 +0000
@@ -633,9 +633,7 @@
 
   NSTRACE (ns_update_auto_hide_menu_bar);
 
-  if (NSApp != nil
-      && [NSApp isActive]
-      && [NSApp respondsToSelector:@selector(setPresentationOptions:)])
+  if (NSApp != nil && [NSApp isActive])
     {
       // Note, "setPresentationOptions" triggers an error unless the
       // application is active.
@@ -644,10 +642,11 @@
       if (menu_bar_should_be_hidden != ns_menu_bar_is_hidden)
         {
           NSApplicationPresentationOptions options
-            = NSApplicationPresentationAutoHideDock;
+            = NSApplicationPresentationDefault;
 
           if (menu_bar_should_be_hidden)
-            options |= NSApplicationPresentationAutoHideMenuBar;
+            options |= NSApplicationPresentationAutoHideMenuBar
+              | NSApplicationPresentationAutoHideDock;
 
           [NSApp setPresentationOptions: options];