emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/ns/next fc08b24 8/8: Remove NS non-native fullscre


From: Alan Third
Subject: [Emacs-diffs] scratch/ns/next fc08b24 8/8: Remove NS non-native fullscreen delay
Date: Sun, 13 Jan 2019 18:11:57 -0500 (EST)

branch: scratch/ns/next
commit fc08b24b371f4e245c4afdac55ea86abf88d3e2c
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>

    Remove NS non-native fullscreen delay
    
    * lisp/frame.el (toggle-frame-fullscreen): Remove delay.
    * src/nsterm.m (ns_fullscreen_hook): Remove timer.
    ([EmacsView toggleFullScreen:]): Remove synchronous display.
---
 lisp/frame.el |  6 +-----
 src/nsterm.m  | 12 +-----------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/lisp/frame.el b/lisp/frame.el
index dc81302..64f0ee7 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2515,11 +2515,7 @@ See also `toggle-frame-maximized'."
              (set-frame-parameter frame 'fullscreen fullscreen-restore)
            (set-frame-parameter frame 'fullscreen nil)))
       (modify-frame-parameters
-       frame `((fullscreen . fullboth) (fullscreen-restore . ,fullscreen))))
-    ;; Manipulating a frame without waiting for the fullscreen
-    ;; animation to complete can cause a crash, or other unexpected
-    ;; behavior, on macOS (bug#28496).
-    (when (featurep 'cocoa) (sleep-for 0.5))))
+       frame `((fullscreen . fullboth) (fullscreen-restore . ,fullscreen))))))
 
 
 ;;;; Key bindings
diff --git a/src/nsterm.m b/src/nsterm.m
index 67c1970..196ca8c 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2069,16 +2069,6 @@ ns_fullscreen_hook (struct frame *f)
   if (!FRAME_VISIBLE_P (f))
     return;
 
-   if (! [view fsIsNative] && f->want_fullscreen == FULLSCREEN_BOTH)
-    {
-      /* Old style fs don't initiate correctly if created from
-         init/default-frame alist, so use a timer (not nice...).  */
-      [NSTimer scheduledTimerWithTimeInterval: 0.5 target: view
-                                     selector: @selector (handleFS)
-                                     userInfo: nil repeats: NO];
-      return;
-    }
-
   block_input ();
   [view handleFS];
   unblock_input ();
@@ -7737,7 +7727,7 @@ not_in_argv (NSString *arg)
       r = [fw frameRectForContentRect:[screen frame]];
       [fw setFrame: r display:YES animate:ns_use_fullscreen_animation];
       [self windowDidEnterFullScreen];
-      [fw display];
+      [self setNeedsDisplay:YES];
     }
   else
     {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]