diff options
| -rw-r--r-- | area_windows.go | 26 | ||||
| -rw-r--r-- | common_windows.go | 12 | ||||
| -rw-r--r-- | stdwndclass_windows.go | 2 | ||||
| -rw-r--r-- | sysdata_windows.go | 2 | ||||
| -rw-r--r-- | todo.md | 2 | ||||
| -rw-r--r-- | uitask_windows.go | 12 | ||||
| -rw-r--r-- | windows_windows.go | 10 |
7 files changed, 33 insertions, 33 deletions
diff --git a/area_windows.go b/area_windows.go index a7ee44c..ee2e4cf 100644 --- a/area_windows.go +++ b/area_windows.go @@ -95,7 +95,7 @@ func paintArea(s *sysData) { hscroll, vscroll := getScrollPos(s.hwnd) - cliprect := image.Rect(int(xrect.Left), int(xrect.Top), int(xrect.Right), int(xrect.Bottom)) + cliprect := image.Rect(int(xrect.left), int(xrect.top), int(xrect.right), int(xrect.bottom)) cliprect = cliprect.Add(image.Pt(int(hscroll), int(vscroll))) // adjust by scroll position // make sure the cliprect doesn't fall outside the size of the Area cliprect = cliprect.Intersect(image.Rect(0, 0, s.areawidth, s.areaheight)) @@ -127,8 +127,8 @@ func paintArea(s *sysData) { // thanks to David Heffernan in http://stackoverflow.com/questions/23033636/winapi-gdi-fillrectcolor-btnface-fills-with-strange-grid-like-brush-on-window r1, _, err = _createCompatibleBitmap.Call( uintptr(hdc), - uintptr(xrect.Right - xrect.Left), - uintptr(xrect.Bottom - xrect.Top)) + uintptr(xrect.right - xrect.left), + uintptr(xrect.bottom - xrect.top)) if r1 == 0 { // failure panic(fmt.Errorf("error creating off-screen rendering bitmap: %v", err)) } @@ -141,10 +141,10 @@ func paintArea(s *sysData) { } prevrbitmap := _HANDLE(r1) rrect := _RECT{ - Left: 0, - Right: xrect.Right - xrect.Left, - Top: 0, - Bottom: xrect.Bottom - xrect.Top, + left: 0, + right: xrect.right - xrect.left, + top: 0, + bottom: xrect.bottom - xrect.top, } r1, _, err = _fillRect.Call( uintptr(rdc), @@ -230,10 +230,10 @@ func paintArea(s *sysData) { // and finally we can just blit that into the window r1, _, err = _bitBlt.Call( uintptr(hdc), - uintptr(xrect.Left), - uintptr(xrect.Top), - uintptr(xrect.Right - xrect.Left), - uintptr(xrect.Bottom - xrect.Top), + uintptr(xrect.left), + uintptr(xrect.top), + uintptr(xrect.right - xrect.left), + uintptr(xrect.bottom - xrect.top), uintptr(rdc), uintptr(0), // from the rdc's origin uintptr(0), @@ -287,8 +287,8 @@ func getAreaControlSize(hwnd _HWND) (width int, height int) { if r1 == 0 { // failure panic(fmt.Errorf("error getting size of actual Area control: %v", err)) } - return int(rect.Right - rect.Left), - int(rect.Bottom - rect.Top) + return int(rect.right - rect.left), + int(rect.bottom - rect.top) } func scrollArea(s *sysData, wparam _WPARAM, which uintptr) { diff --git a/common_windows.go b/common_windows.go index fb78ed7..52bfddf 100644 --- a/common_windows.go +++ b/common_windows.go @@ -65,15 +65,15 @@ func (l _LPARAM) _Y() int32 { } type _POINT struct { - X int32 - Y int32 + x int32 + y int32 } type _RECT struct { - Left int32 - Top int32 - Right int32 - Bottom int32 + left int32 + top int32 + right int32 + bottom int32 } // Predefined cursor resource IDs. diff --git a/stdwndclass_windows.go b/stdwndclass_windows.go index edf0149..1f860a5 100644 --- a/stdwndclass_windows.go +++ b/stdwndclass_windows.go @@ -53,7 +53,7 @@ func stdWndProc(s *sysData) func(hwnd _HWND, uMsg uint32, wParam _WPARAM, lParam panic("GetClientRect failed: " + err.Error()) } // top-left corner is (0,0) so no need for winheight - s.doResize(int(r.Left), int(r.Top), int(r.Right), int(r.Bottom), 0) + s.doResize(int(r.left), int(r.top), int(r.right), int(r.bottom), 0) // TODO use the Defer movement functions here? } return 0 diff --git a/sysdata_windows.go b/sysdata_windows.go index ba87edb..bba0015 100644 --- a/sysdata_windows.go +++ b/sysdata_windows.go @@ -503,7 +503,7 @@ func (s *sysData) setWindowSize(width int, height int) error { return fmt.Errorf("error getting upper-left of window for resize: %v", r.err) } // 0 because (0,0) is top-left so no winheight - err := s.setRect(int(rect.Left), int(rect.Top), width, height, 0) + err := s.setRect(int(rect.left), int(rect.top), width, height, 0) if err != nil { return fmt.Errorf("error actually resizing window: %v", err) } @@ -56,5 +56,5 @@ super ultra important things: other things: - on windows 7, progress bars seem to animate from 0 -> pos when you turn off marquee mode and set pos; see if that's documented or if I'm doing something wrong - intentional: http://social.msdn.microsoft.com/Forums/en-US/61350dc7-6584-4c4e-91b0-69d642c03dae/progressbar-disable-smooth-animation http://stackoverflow.com/questions/2217688/windows-7-aero-theme-progress-bar-bug http://discuss.joelonsoftware.com/default.asp?dotnet.12.600456.2 http://stackoverflow.com/questions/22469876/progressbar-lag-when-setting-position-with-pbm-setpos http://stackoverflow.com/questions/6128287/tprogressbar-never-fills-up-all-the-way-seems-to-be-updating-too-fast - these links have workarounds but blah; more proof that progressbars were programmatically intended to be incremented in steps -- clean up windows struct field names (holdover from when the intent was to make a wrapper lib first and then use it rather than using the windows API directly) +- check all uses of RECT.right/.bottom in Windows that don't have an accompanying -RECT.left/.top to make sure they're correct - make all widths and heights parameters in constructors in the same place (or drop the ones in Window entirely?) diff --git a/uitask_windows.go b/uitask_windows.go index 4c3bf8c..db9aa24 100644 --- a/uitask_windows.go +++ b/uitask_windows.go @@ -102,12 +102,12 @@ var getMessageFail = -1 // because Go doesn't let me func msgloop() { var msg struct { - Hwnd _HWND - Message uint32 - WParam _WPARAM - LParam _LPARAM - Time uint32 - Pt _POINT + hwnd _HWND + message uint32 + wParam _WPARAM + lParam _LPARAM + time uint32 + pt _POINT } for { diff --git a/windows_windows.go b/windows_windows.go index aa3d5c2..ea848f9 100644 --- a/windows_windows.go +++ b/windows_windows.go @@ -288,11 +288,11 @@ const ( ) type _MINMAXINFO struct { - PtReserved _POINT - PtMaxSize _POINT - PtMaxPosition _POINT - PtMinTrackSize _POINT - PtMaxTrackSize _POINT + ptReserved _POINT + ptMaxSize _POINT + ptMaxPosition _POINT + ptMinTrackSize _POINT + ptMaxTrackSize _POINT } func (l _LPARAM) MINMAXINFO() *_MINMAXINFO { |