joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-04 08:55:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/app: (windows) process all events before redrawing

Browse Source 
While here, make sure the DestroyEvent is sent after exiting the
event loop.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-09-23 20:49:51 +01:00
parent 5c9d35c186
commit 736692a725
1 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/app/os_windows.go
+16 -28
View File
@@ -149,7 +149,8 @@ const (
_WAIT_OBJECT_0 = 0 _WAIT_OBJECT_0 = 0
_PM_REMOVE = 0x0001 _PM_REMOVE = 0x0001
_PM_NOREMOVE = 0x0000
) )
const _WM_REDRAW = _WM_USER + 0 const _WM_REDRAW = _WM_USER + 0
@@ -178,8 +179,11 @@ func createWindow(window *Window, opts *windowOptions) error {
} }
defer w.destroy() defer w.destroy()
cerr <- nil cerr <- nil
winMap[w.hwnd] = w
defer delete(winMap, w.hwnd)
w.w = window w.w = window
w.w.setDriver(w) w.w.setDriver(w)
defer w.w.event(DestroyEvent{})
showWindow(w.hwnd, _SW_SHOWDEFAULT) showWindow(w.hwnd, _SW_SHOWDEFAULT)
setForegroundWindow(w.hwnd) setForegroundWindow(w.hwnd)
setFocus(w.hwnd) setFocus(w.hwnd)
@@ -243,7 +247,6 @@ func createNativeWindow(opts *windowOptions) (*window, error) {
w := &window{ w := &window{
hwnd: hwnd, hwnd: hwnd,
} }
winMap[hwnd] = w
w.hdc, err = getDC(hwnd) w.hdc, err = getDC(hwnd)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -317,17 +320,7 @@ func windowProc(hwnd syscall.Handle, msg uint32, wParam, lParam uintptr) uintptr
case _WM_MOUSEWHEEL: case _WM_MOUSEWHEEL:
w.scrollEvent(wParam, lParam) w.scrollEvent(wParam, lParam)
case _WM_DESTROY: case _WM_DESTROY:
delete(winMap, hwnd)
w.dead = true w.dead = true
w.w.event(DestroyEvent{})
case _WM_REDRAW:
w.mu.Lock()
anim := w.animating
w.mu.Unlock()
if anim {
w.draw(false)
w.postRedraw()
}
case _WM_PAINT: case _WM_PAINT:
w.draw(true) w.draw(true)
case _WM_SIZE: case _WM_SIZE:
@@ -367,27 +360,22 @@ func (w *window) scrollEvent(wParam, lParam uintptr) {
// Adapted from https://blogs.msdn.microsoft.com/oldnewthing/20060126-00/?p=32513/ // Adapted from https://blogs.msdn.microsoft.com/oldnewthing/20060126-00/?p=32513/
func (w *window) loop() error { func (w *window) loop() error {
loop: msg := new(msg)
for !w.dead { for !w.dead {
var msg msg w.mu.Lock()
// Since posted messages are always returned before system messages, anim := w.animating
// but we want our WM_REDRAW to always come last, just like WM_PAINT. w.mu.Unlock()
// So peek for system messages first, and fall back to processing if anim && !peekMessage(msg, w.hwnd, 0, 0, _PM_NOREMOVE) {
// all messages. w.draw(false)
if !peekMessage(&msg, w.hwnd, 0, _WM_REDRAW-1, _PM_REMOVE) { continue
getMessage(&msg, w.hwnd, 0, 0)
}
// Clear queue of all other redraws.
if msg.message == _WM_REDRAW {
for peekMessage(&msg, w.hwnd, _WM_REDRAW, _WM_REDRAW, _PM_REMOVE) {
}
} }
getMessage(msg, w.hwnd, 0, 0)
if msg.message == _WM_QUIT { if msg.message == _WM_QUIT {
postQuitMessage(msg.wParam) postQuitMessage(msg.wParam)
break loop break
} }
translateMessage(&msg) translateMessage(msg)
dispatchMessage(&msg) dispatchMessage(msg)
} }
return nil return nil
} }