martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't force auto hide dock when hide menu changes.

Browse Source 
(ns_update_auto_hide_menu_bar): Remove runtime check.
Don't auto hide dock unless menubar is also auto hidden.
This commit is contained in:
Jan Djärv
2013-10-06 17:59:11 +02:00
parent 28c760996e
commit a3e9050cbb
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChangeLog
View File

@@ -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>

9
src/nsterm.m
View File

@@ -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];