diff options
| author | Jan Djärv | 2013-10-06 17:59:11 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-10-06 17:59:11 +0200 |
| commit | a3e9050cbbfc97d3e0d37a84fcaa00f724e34bfa (patch) | |
| tree | 360b8dfa7a1c2eb7772a8766550a7550fdd01ee9 /src/nsterm.m | |
| parent | 28c760996e94d41321d33b97237e491659516bd0 (diff) | |
| download | emacs-a3e9050cbbfc97d3e0d37a84fcaa00f724e34bfa.tar.gz emacs-a3e9050cbbfc97d3e0d37a84fcaa00f724e34bfa.zip | |
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.
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 9 |
1 files changed, 4 insertions, 5 deletions
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) | |||
| 633 | 633 | ||
| 634 | NSTRACE (ns_update_auto_hide_menu_bar); | 634 | NSTRACE (ns_update_auto_hide_menu_bar); |
| 635 | 635 | ||
| 636 | if (NSApp != nil | 636 | if (NSApp != nil && [NSApp isActive]) |
| 637 | && [NSApp isActive] | ||
| 638 | && [NSApp respondsToSelector:@selector(setPresentationOptions:)]) | ||
| 639 | { | 637 | { |
| 640 | // Note, "setPresentationOptions" triggers an error unless the | 638 | // Note, "setPresentationOptions" triggers an error unless the |
| 641 | // application is active. | 639 | // application is active. |
| @@ -644,10 +642,11 @@ ns_update_auto_hide_menu_bar (void) | |||
| 644 | if (menu_bar_should_be_hidden != ns_menu_bar_is_hidden) | 642 | if (menu_bar_should_be_hidden != ns_menu_bar_is_hidden) |
| 645 | { | 643 | { |
| 646 | NSApplicationPresentationOptions options | 644 | NSApplicationPresentationOptions options |
| 647 | = NSApplicationPresentationAutoHideDock; | 645 | = NSApplicationPresentationDefault; |
| 648 | 646 | ||
| 649 | if (menu_bar_should_be_hidden) | 647 | if (menu_bar_should_be_hidden) |
| 650 | options |= NSApplicationPresentationAutoHideMenuBar; | 648 | options |= NSApplicationPresentationAutoHideMenuBar |
| 649 | | NSApplicationPresentationAutoHideDock; | ||
| 651 | 650 | ||
| 652 | [NSApp setPresentationOptions: options]; | 651 | [NSApp setPresentationOptions: options]; |
| 653 | 652 | ||