interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Pietro Gagliardi 2014-05-25 01:03:45 -04:00
parent 4408c1bf42
commit b27caae7c3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
area_windows.go
View File

@ -474,8 +474,8 @@ func areaMouseEvent(s *sysData, button uint, up bool, wparam _WPARAM, lparam _LP
var me MouseEvent var me MouseEvent
xpos, ypos := getScrollPos(s.hwnd) // mouse coordinates are relative to control; make them relative to Area xpos, ypos := getScrollPos(s.hwnd) // mouse coordinates are relative to control; make them relative to Area
xpos += lparam._X() xpos += lparam.X()
ypos += lparam._Y() ypos += lparam.Y()
me.Pos = image.Pt(int(xpos), int(ypos)) 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 if !me.Pos.In(image.Rect(0, 0, s.areawidth, s.areaheight)) { // outside the actual Area; no event
return return

4
common_windows.go
View File

@ -50,14 +50,14 @@ func _MAKEINTRESOURCE(what uint16) uintptr {
return uintptr(what) return uintptr(what)
} }
func (l _LPARAM) _X() int32 { func (l _LPARAM) X() int32 {
// according to windowsx.h // according to windowsx.h
loword := uint16(l & 0xFFFF) loword := uint16(l & 0xFFFF)
short := int16(loword) // convert to signed... short := int16(loword) // convert to signed...
return int32(short) // ...and sign extend return int32(short) // ...and sign extend
} }
func (l _LPARAM) _Y() int32 { func (l _LPARAM) Y() int32 {
// according to windowsx.h // according to windowsx.h
hiword := uint16((l & 0xFFFF0000) >> 16) hiword := uint16((l & 0xFFFF0000) >> 16)
short := int16(hiword) // convert to signed... short := int16(hiword) // convert to signed...