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

fix problems and consistency with fullscreen in frame%

Browse Source 
The `fullscreen` method implied `show` on Mac OS X and Windows, but
not on Gtk, and a frae shown that was was not properly registered
as shown (e.g., the application could exit). For consistency, adjust
`fullscreen` to not imply `show`. Also, shift to a remaining frame
on Mac OS X when a fullscreen frame is closed.
This commit is contained in:
Matthew Flatt 2015-10-04 14:12:31 -06:00
parent ea576d3177
commit cdc992ccb9
3 changed files with 82 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui-doc/scribblings/gui/frame-class.scrbl
View File

@ -124,7 +124,7 @@ See also @method[frame% set-status-text].
void?]{ void?]{
Puts the frame in fullscreen mode or restores the frame to Puts the frame in fullscreen mode or restores the frame to
non-fullscreen mode. non-fullscreen mode. The frame's show state is not affected.
@Unmonitored[@elem{A frame's mode} @elem{the user} @elem{a @Unmonitored[@elem{A frame's mode} @elem{the user} @elem{a
frame has been put in fullscreen mode} @elem{@method[frame% is-fullscreened?]}] frame has been put in fullscreen mode} @elem{@method[frame% is-fullscreened?]}]
@ -133,9 +133,9 @@ On Mac OS X, the @racket[frame%] must be created with the style
@racket['fullscreen-button] for fullscreen mode to work, and Mac OS X @racket['fullscreen-button] for fullscreen mode to work, and Mac OS X
10.7 or later is required. 10.7 or later is required.
@history[#:added "6.0.0.6"] @history[#:added "1.9"
#:changed "1.18" @elem{Changed @method[frame% fullscreen] with @racket[#t]
} to not imply @method[window<%> show] on Windows and Mac OS X.}]}
@defmethod[(get-menu-bar) @defmethod[(get-menu-bar)
(or/c (is-a?/c menu-bar%) #f)]{ (or/c (is-a?/c menu-bar%) #f)]{

30
gui-lib/mred/private/wx/cocoa/frame.rkt
View File

@ -27,7 +27,7 @@
(import-class NSWindow NSGraphicsContext NSMenu NSPanel (import-class NSWindow NSGraphicsContext NSMenu NSPanel
NSApplication NSAutoreleasePool NSScreen NSApplication NSAutoreleasePool NSScreen
NSToolbar) NSToolbar NSArray)
(define NSWindowCloseButton 0) (define NSWindowCloseButton 0)
(define NSWindowToolbarButton 3) (define NSWindowToolbarButton 3)
@ -360,7 +360,11 @@
contextInfo: #f)) contextInfo: #f))
(if float? (if float?
(tellv cocoa orderFront: #f) (tellv cocoa orderFront: #f)
(tellv cocoa makeKeyAndOrderFront: #f))) (begin
(tellv cocoa makeKeyAndOrderFront: #f)
(when unshown-fullscreen?
(set! unshown-fullscreen? #f)
(tellv cocoa toggleFullScreen: #f)))))
(begin (begin
(when is-a-dialog? (when is-a-dialog?
(let ([p (get-parent)]) (let ([p (get-parent)])
@ -371,7 +375,13 @@
endSheet: cocoa)))) endSheet: cocoa))))
(when (is-shown?) ; otherwise, `deminiaturize' can show the window (when (is-shown?) ; otherwise, `deminiaturize' can show the window
(tellv cocoa deminiaturize: #f) (tellv cocoa deminiaturize: #f)
(tellv cocoa orderOut: #f)) (define fs? (fullscreened?))
(set! unshown-fullscreen? fs?)
(tellv cocoa orderOut: #f)
(when fs?
;; Need to select another window to get rid of
;; the window's screen:
(tellv (get-app-front-window) orderFront: #f)))
(force-window-focus))) (force-window-focus)))
(register-frame-shown this on?) (register-frame-shown this on?)
(let ([num (tell #:type _NSInteger cocoa windowNumber)]) (let ([num (tell #:type _NSInteger cocoa windowNumber)])
@ -699,11 +709,19 @@
(tellv cocoa miniaturize: cocoa) (tellv cocoa miniaturize: cocoa)
(tellv cocoa deminiaturize: cocoa))) (tellv cocoa deminiaturize: cocoa)))
(define unshown-fullscreen? #f)
(define/public (fullscreened?) (define/public (fullscreened?)
(positive? (bitwise-and (tell #:type _NSUInteger cocoa styleMask) NSFullScreenWindowMask))) (and (version-10.7-or-later?)
(if (tell #:type _bool cocoa isVisible)
(positive? (bitwise-and (tell #:type _NSUInteger cocoa styleMask) NSFullScreenWindowMask))
unshown-fullscreen?)))
(define/public (fullscreen on?) (define/public (fullscreen on?)
(unless (eq? (and on? #t) (fullscreened?)) (when (version-10.7-or-later?)
(tellv cocoa toggleFullScreen: #f))) (unless (eq? (and on? #t) (fullscreened?))
(if (tell #:type _bool cocoa isVisible)
(tellv cocoa toggleFullScreen: #f)
(set! unshown-fullscreen? (and on? #t))))))
(define/public (set-title s) (define/public (set-title s)
(tellv cocoa setTitle: #:type _NSString s)) (tellv cocoa setTitle: #:type _NSString s))

97
gui-lib/mred/private/wx/win32/frame.rkt
View File

@ -313,7 +313,12 @@
(ShowWindow hwnd SW_RESTORE)) (ShowWindow hwnd SW_RESTORE))
(when on? (when on?
(unless float-without-caption? (unless float-without-caption?
(BringWindowToTop hwnd)))) (BringWindowToTop hwnd)))
(when (and on? unshown-fullscreen?)
(set! unshown-fullscreen? #f)
(fullscreen #t))
(when (not on?)
(set! unshown-fullscreen? (fullscreened?))))
(define/public (destroy) (define/public (destroy)
(direct-show #f)) (direct-show #f))
@ -589,54 +594,60 @@
(define pre-fullscreen-rect #f) (define pre-fullscreen-rect #f)
(define pre-fullscreen-style 0) (define pre-fullscreen-style 0)
(define unshown-fullscreen? #f)
(define/public (fullscreened?) (define/public (fullscreened?)
; check our dimensions against those of the nearest monitor (cond
(define win-rect (GetWindowRect hwnd)) [(is-shown?)
(define mon (MonitorFromWindow hwnd MONITOR_DEFAULTTONEAREST)) ;; check our dimensions against those of the nearest monitor
(define mi (cast (malloc _MONITORINFO) (define win-rect (GetWindowRect hwnd))
_pointer (define mon (MonitorFromWindow hwnd MONITOR_DEFAULTTONEAREST))
_MONITORINFO-pointer)) (define mi (cast (malloc _MONITORINFO)
(set-MONITORINFO-cbSize! mi (ctype-sizeof _MONITORINFO)) _pointer
(GetMonitorInfoW mon mi) _MONITORINFO-pointer))
(define mon-rect (MONITORINFO-rcMonitor mi)) (set-MONITORINFO-cbSize! mi (ctype-sizeof _MONITORINFO))
(GetMonitorInfoW mon mi)
(and (= (RECT-left mon-rect) (RECT-left win-rect)) (define mon-rect (MONITORINFO-rcMonitor mi))
(= (RECT-right mon-rect) (RECT-right win-rect))
(= (RECT-top mon-rect) (RECT-top win-rect)) (and (= (RECT-left mon-rect) (RECT-left win-rect))
(= (RECT-bottom mon-rect) (RECT-bottom win-rect)))) (= (RECT-right mon-rect) (RECT-right win-rect))
(= (RECT-top mon-rect) (RECT-top win-rect))
(= (RECT-bottom mon-rect) (RECT-bottom win-rect)))]
[else unshown-fullscreen?]))
(define/public (fullscreen on?) (define/public (fullscreen on?)
(if on? (if on?
(let ([mon (MonitorFromWindow hwnd MONITOR_DEFAULTTONEAREST)] (if (is-shown?)
[mi (cast (malloc _MONITORINFO) (let ([mon (MonitorFromWindow hwnd MONITOR_DEFAULTTONEAREST)]
_pointer [mi (cast (malloc _MONITORINFO)
_MONITORINFO-pointer)]) _pointer
(set-MONITORINFO-cbSize! mi (ctype-sizeof _MONITORINFO)) _MONITORINFO-pointer)])
(GetMonitorInfoW mon mi) (set-MONITORINFO-cbSize! mi (ctype-sizeof _MONITORINFO))
(define mon-rect (MONITORINFO-rcMonitor mi)) (GetMonitorInfoW mon mi)
(define mon-rect (MONITORINFO-rcMonitor mi))
(define current-style (cast (GetWindowLongPtrW hwnd GWL_STYLE) _pointer _intptr))
(define current-style (cast (GetWindowLongPtrW hwnd GWL_STYLE) _pointer _intptr))
; if (fullscreen #t) is called repeatedly, we don't want to overwrite ;; if (fullscreen #t) is called repeatedly, we don't want to overwrite
; a useful description of the window's pre-fullscreened state with one ;; a useful description of the window's pre-fullscreened state with one
; that says to fullscreen it again ;; that says to fullscreen it again
(when (eq? pre-fullscreen-rect #f) (when (eq? pre-fullscreen-rect #f)
(set! pre-fullscreen-rect (GetWindowRect hwnd))) (set! pre-fullscreen-rect (GetWindowRect hwnd)))
(when (= pre-fullscreen-style 0) (when (= pre-fullscreen-style 0)
(set! pre-fullscreen-style current-style)) (set! pre-fullscreen-style current-style))
(SetWindowLongPtrW hwnd GWL_STYLE (SetWindowLongPtrW hwnd GWL_STYLE
(cast (cast
(bitwise-ior (bitwise-and current-style (bitwise-not WS_OVERLAPPEDWINDOW) (bitwise-ior (bitwise-and current-style (bitwise-not WS_OVERLAPPEDWINDOW)
WS_POPUP)) WS_POPUP))
_intptr _pointer)) _intptr _pointer))
(SetWindowPos hwnd HWND_TOP (SetWindowPos hwnd HWND_TOP
(RECT-left mon-rect) (RECT-left mon-rect)
(RECT-top mon-rect) (RECT-top mon-rect)
(- (RECT-right mon-rect) (RECT-left mon-rect)) (- (RECT-right mon-rect) (RECT-left mon-rect))
(- (RECT-bottom mon-rect) (RECT-top mon-rect)) (- (RECT-bottom mon-rect) (RECT-top mon-rect))
(bitwise-ior SWP_NOCOPYBITS SWP_SHOWWINDOW))) (bitwise-ior SWP_NOCOPYBITS SWP_SHOWWINDOW)))
(set! unshown-fullscreen? (and on? #t)))
(begin (begin
(unless (= pre-fullscreen-style 0) (unless (= pre-fullscreen-style 0)
(SetWindowLongPtrW hwnd GWL_STYLE (cast pre-fullscreen-style _intptr _pointer)) (SetWindowLongPtrW hwnd GWL_STYLE (cast pre-fullscreen-style _intptr _pointer))