Skip to content

container.go, customwidget.go: add WM_PRINTCLIENT handler to containe… #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dblohm7 merged 1 commit into from
Aug 30, 2024
Merged

container.go, customwidget.go: add WM_PRINTCLIENT handler to containe… #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build windows
// +build windows

package walk
Expand Down Expand Up @@ -195,12 +196,8 @@ func (cb *ContainerBase) RestoreState() error {
})
}

func (cb *ContainerBase) doPaint() error {
var ps win.PAINTSTRUCT

hdc := win.BeginPaint(cb.hWnd, &ps)
defer win.EndPaint(cb.hWnd, &ps)

func (cb *ContainerBase) doPaint(ps *win.PAINTSTRUCT) error {
hdc := ps.Hdc
canvas, err := newCanvasFromHDC(hdc)
if err != nil {
return err
Expand Down Expand Up @@ -281,9 +278,26 @@ func (cb *ContainerBase) WndProc(hwnd win.HWND, msg uint32, wParam, lParam uintp
break
}

// If it fails, what can we do about it? Panic? That's extreme. So just ignore it.
_ = cb.doPaint()
var ps win.PAINTSTRUCT
if hdc := win.BeginPaint(cb.hWnd, &ps); hdc == 0 {
break
}
defer win.EndPaint(cb.hWnd, &ps)

cb.doPaint(&ps)
return 0

case win.WM_PRINTCLIENT:
if FocusEffect == nil && InteractionEffect == nil && ValidationErrorEffect == nil {
break
}

ps := win.PAINTSTRUCT{
Hdc: win.HDC(wParam),
}
if win.GetClientRect(cb.hWnd, &ps.RcPaint) {
cb.doPaint(&ps)
}
return 0

case win.WM_COMMAND:
Expand Down
72 changes: 36 additions & 36 deletions customwidget.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build windows
// +build windows

package walk
Expand Down Expand Up @@ -110,6 +111,26 @@ func (cw *CustomWidget) SetPaintMode(value PaintMode) {
cw.paintMode = value
}

func (cw *CustomWidget) doPaint(ps *win.PAINTSTRUCT) error {
hdc := ps.Hdc
canvas, err := newCanvasFromHDC(hdc)
if err != nil {
return newError("newCanvasFromHDC failed")
}
defer canvas.Dispose()

bounds := rectangleFromRECT(ps.RcPaint)
if cw.paintMode == PaintBuffered {
err = cw.bufferedPaint(canvas, bounds)
} else if cw.paintPixels != nil {
err = cw.paintPixels(canvas, bounds)
} else {
err = cw.paint(canvas, RectangleTo96DPI(bounds, cw.DPI()))
}

return err
}

func (cw *CustomWidget) WndProc(hwnd win.HWND, msg uint32, wParam, lParam uintptr) uintptr {
switch msg {
case win.WM_PAINT:
Expand All @@ -119,44 +140,12 @@ func (cw *CustomWidget) WndProc(hwnd win.HWND, msg uint32, wParam, lParam uintpt
}

var ps win.PAINTSTRUCT

var hdc win.HDC
if wParam == 0 {
hdc = win.BeginPaint(cw.hWnd, &ps)
} else {
hdc = win.HDC(wParam)
}
if hdc == 0 {
if hdc := win.BeginPaint(cw.hWnd, &ps); hdc == 0 {
newError("BeginPaint failed")
break
}
defer func() {
if wParam == 0 {
win.EndPaint(cw.hWnd, &ps)
}
}()

canvas, err := newCanvasFromHDC(hdc)
if err != nil {
newError("newCanvasFromHDC failed")
break
}
defer canvas.Dispose()

bounds := rectangleFromRECT(ps.RcPaint)
if cw.paintMode == PaintBuffered {
err = cw.bufferedPaint(canvas, bounds)
} else if cw.paintPixels != nil {
err = cw.paintPixels(canvas, bounds)
} else {
err = cw.paint(canvas, RectangleTo96DPI(bounds, cw.DPI()))
}

if err != nil {
newError("paint failed")
break
}

defer win.EndPaint(cw.hWnd, &ps)
cw.doPaint(&ps)
return 0

case win.WM_ERASEBKGND:
Expand All @@ -165,7 +154,18 @@ func (cw *CustomWidget) WndProc(hwnd win.HWND, msg uint32, wParam, lParam uintpt
}

case win.WM_PRINTCLIENT:
win.SendMessage(hwnd, win.WM_PAINT, wParam, lParam)
if cw.paint == nil && cw.paintPixels == nil {
newError("paint(Pixels) func is nil")
break
}

ps := win.PAINTSTRUCT{
Hdc: win.HDC(wParam),
}
if win.GetClientRect(cw.hWnd, &ps.RcPaint) {
cw.doPaint(&ps)
}
return 0

case win.WM_WINDOWPOSCHANGED:
wp := (*win.WINDOWPOS)(unsafe.Pointer(lParam))
Expand Down