diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-10-06 17:59:11 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-10-06 17:59:11 +0200 |
| commit | a3e9050cbbfc97d3e0d37a84fcaa00f724e34bfa (patch) | |
| tree | 360b8dfa7a1c2eb7772a8766550a7550fdd01ee9 | |
| parent | 28c760996e94d41321d33b97237e491659516bd0 (diff) | |
| download | emacs-a3e9050cbbfc97d3e0d37a84fcaa00f724e34bfa.tar.gz | |
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.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/nsterm.m | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index af5dbb8924d..07af64ab1a1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 <xfq.free@gmail.com> diff --git a/src/nsterm.m b/src/nsterm.m index be660d99e8a..696d379206e 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -633,9 +633,7 @@ ns_update_auto_hide_menu_bar (void) 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 @@ ns_update_auto_hide_menu_bar (void) 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]; |