suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix frame activation and menu bars

Browse Source
This commit is contained in:
Matthew Flatt 2010-07-23 13:27:43 -05:00
parent 5af3d96a5d
commit 152526045a
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
collects/mred/private/wx/cocoa/frame.rkt
View File

@ -10,7 +10,8 @@
"queue.rkt" "queue.rkt"
"menu-bar.rkt" "menu-bar.rkt"
"../../syntax.rkt" "../../syntax.rkt"
"../common/queue.rkt") "../common/queue.rkt"
"../../lock.rkt")
(unsafe!) (unsafe!)
(objc-unsafe!) (objc-unsafe!)
@ -18,11 +19,13 @@
;; ---------------------------------------- ;; ----------------------------------------
(import-class NSWindow NSGraphicsContext NSMenu) (import-class NSWindow NSGraphicsContext NSMenu
NSApplication NSAutoreleasePool)
(define front #f) (define front #f)
(define empty-mb (new menu-bar%)) (define empty-mb (new menu-bar%))
(define root-fake-frame #f)
(define-objc-class MyWindow NSWindow (define-objc-class MyWindow NSWindow
#:mixins (FocusResponder KeyMouseResponder) #:mixins (FocusResponder KeyMouseResponder)
@ -48,12 +51,13 @@
[-a _void (windowDidBecomeMain: [_id notification]) [-a _void (windowDidBecomeMain: [_id notification])
(when wx (when wx
(set! front wx) (set! front wx)
(send wx install-mb)
(queue-window-event wx (lambda () (queue-window-event wx (lambda ()
(send wx install-mb)
(send wx on-activate #t))))] (send wx on-activate #t))))]
[-a _void (windowDidResignMain: [_id notification]) [-a _void (windowDidResignMain: [_id notification])
(when wx (when wx
(when (eq? front wx) (set! front #f)) (when (eq? front wx) (set! front #f))
(send empty-mb install)
(queue-window-event wx (lambda () (queue-window-event wx (lambda ()
(send wx on-activate #f))))]) (send wx on-activate #f))))])
@ -130,10 +134,30 @@
(tellv cocoa setTitle: #:type _NSString label)) (tellv cocoa setTitle: #:type _NSString label))
(define/public (direct-show on?) (define/public (direct-show on?)
(if on? (as-entry
(tellv cocoa makeKeyAndOrderFront: #f) (lambda ()
(tellv cocoa orderOut: #f)) (when (and (not on?)
(register-frame-shown this on?)) (eq? front this))
(set! front #f)
(send empty-mb install))
(if on?
(tellv cocoa makeKeyAndOrderFront: #f)
(begin
(tellv cocoa orderOut: #f)
(let ([next
(let* ([pool (tell (tell NSAutoreleasePool alloc) init)]
[wins (tell (tell NSApplication sharedApplication) orderedWindows)])
(begin0
(for/or ([i (in-range (tell #:type _NSUInteger wins count))])
(let ([win (tell wins objectAtIndex: #:type _NSUInteger i)])
(and (tell #:type _BOOL win isVisible)
win)))
(tellv pool release)))])
(cond
[next (tellv next makeKeyWindow)]
[root-fake-frame (send root-fake-frame install-mb)]
[else (void)]))))
(register-frame-shown this on?))))
(define/override (show on?) (define/override (show on?)
(direct-show on?)) (direct-show on?))
@ -227,7 +251,8 @@
(def/public-unimplemented on-menu-command) (def/public-unimplemented on-menu-command)
(def/public-unimplemented on-mdi-activate) (def/public-unimplemented on-mdi-activate)
(def/public-unimplemented on-close) (def/public-unimplemented on-close)
(define/public (designate-root-frame) (void)) (define/public (designate-root-frame)
(set! root-fake-frame this))
(def/public-unimplemented system-menu) (def/public-unimplemented system-menu)
(define/public (set-modified on?) (define/public (set-modified on?)