Renamed _LPARAM._X()/_LPARAM._Y() to _LPARAM.X()/_LPARAM.Y(): it doesn't matter since _LPARAM is not exported anyway, _WPARAM already had this change, and the constant checking tool complains that _X()/_Y() remain undefined (too early? do I need to merge the package files?).
This commit is contained in:
parent
4408c1bf42
commit
b27caae7c3
|
@ -474,8 +474,8 @@ func areaMouseEvent(s *sysData, button uint, up bool, wparam _WPARAM, lparam _LP
|
|||
var me MouseEvent
|
||||
|
||||
xpos, ypos := getScrollPos(s.hwnd) // mouse coordinates are relative to control; make them relative to Area
|
||||
xpos += lparam._X()
|
||||
ypos += lparam._Y()
|
||||
xpos += lparam.X()
|
||||
ypos += lparam.Y()
|
||||
me.Pos = image.Pt(int(xpos), int(ypos))
|
||||
if !me.Pos.In(image.Rect(0, 0, s.areawidth, s.areaheight)) { // outside the actual Area; no event
|
||||
return
|
||||
|
|
|
@ -50,14 +50,14 @@ func _MAKEINTRESOURCE(what uint16) uintptr {
|
|||
return uintptr(what)
|
||||
}
|
||||
|
||||
func (l _LPARAM) _X() int32 {
|
||||
func (l _LPARAM) X() int32 {
|
||||
// according to windowsx.h
|
||||
loword := uint16(l & 0xFFFF)
|
||||
short := int16(loword) // convert to signed...
|
||||
return int32(short) // ...and sign extend
|
||||
}
|
||||
|
||||
func (l _LPARAM) _Y() int32 {
|
||||
func (l _LPARAM) Y() int32 {
|
||||
// according to windowsx.h
|
||||
hiword := uint16((l & 0xFFFF0000) >> 16)
|
||||
short := int16(hiword) // convert to signed...
|
||||
|
|
Loading…
Reference in New Issue