[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6095997: Fixed NextStep fullscreen problem (bug#217
From: |
Anders Lindgren |
Subject: |
[Emacs-diffs] master 6095997: Fixed NextStep fullscreen problem (bug#21770). |
Date: |
Fri, 06 Nov 2015 21:40:04 +0000 |
branch: master
commit 60959975b1b44ad9c4a4019a0a203c8a3bf08fd3
Author: Anders Lindgren <address@hidden>
Commit: Anders Lindgren <address@hidden>
Fixed NextStep fullscreen problem (bug#21770).
* nsterm.m (ns_constrain_all_frames): Don't constrain fullscreen
frames.
---
src/nsterm.m | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index 4f97276..b4ec553 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -839,6 +839,9 @@ static NSRect constrain_frame_rect(NSRect frameRect)
static void
ns_constrain_all_frames (void)
+/* --------------------------------------------------------------------------
+ Ensure that the menu bar doesn't cover any frames.
+ --------------------------------------------------------------------------
*/
{
Lisp_Object tail, frame;
@@ -851,10 +854,14 @@ ns_constrain_all_frames (void)
struct frame *f = XFRAME (frame);
if (FRAME_NS_P (f))
{
- NSView *view = FRAME_NS_VIEW (f);
+ EmacsView *view = FRAME_NS_VIEW (f);
- [[view window] setFrame:constrain_frame_rect([[view window] frame])
- display:NO];
+ if (![view isFullscreen])
+ {
+ [[view window]
+ setFrame:constrain_frame_rect([[view window] frame])
+ display:NO];
+ }
}
}
@@ -862,10 +869,11 @@ ns_constrain_all_frames (void)
}
-/* Show or hide the menu bar, based on user setting. */
-
static void
ns_update_auto_hide_menu_bar (void)
+/* --------------------------------------------------------------------------
+ Show or hide the menu bar, based on user setting.
+ --------------------------------------------------------------------------
*/
{
#ifdef NS_IMPL_COCOA
NSTRACE ("ns_update_auto_hide_menu_bar");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 6095997: Fixed NextStep fullscreen problem (bug#21770).,
Anders Lindgren <=