diff options
| -rw-r--r-- | controlsize.go | 7 | ||||
| -rw-r--r-- | controlsize_sys.go | 4 | ||||
| -rw-r--r-- | controlsize_windows.go (renamed from prefsize_windows.go) | 138 | ||||
| -rw-r--r-- | grid.go | 11 | ||||
| -rw-r--r-- | stack.go | 9 |
5 files changed, 119 insertions, 50 deletions
diff --git a/controlsize.go b/controlsize.go index 7a608d2..ff0973b 100644 --- a/controlsize.go +++ b/controlsize.go @@ -11,6 +11,13 @@ type allocation struct { neighbor Control } +type cSysSizeData struct { + xmargin int + ymargin int + xpadding int + ypadding int +} + // for verification; see sysdata.go type sysDataSizeFuncs interface { beginResize() *sysSizeData diff --git a/controlsize_sys.go b/controlsize_sys.go index c520a30..153ed69 100644 --- a/controlsize_sys.go +++ b/controlsize_sys.go @@ -1,4 +1,6 @@ -// <codedate +// +build SKIP + +// 25 june 2014 package ui diff --git a/prefsize_windows.go b/controlsize_windows.go index 5605484..3bb3ecb 100644 --- a/prefsize_windows.go +++ b/controlsize_windows.go @@ -7,6 +7,72 @@ import ( "unsafe" ) +type sysSizeData struct { + cSysSizeData + + // for size calculations + baseX int + baseY int + + // for the actual resizing + // possibly the HDWP +} + +const ( + marginDialogUnits = 7 + paddingDialogUnits = 4 +} + +func (s *sysData) beginResize() (d *sysSizeData) { + d = new(sysSizeData) + + dc := getTextDC(s.hwnd) + defer releaseTextDC(dc) + + r1, _, err = _getTextMetrics.Call( + uintptr(dc), + uintptr(unsafe.Pointer(&tm))) + if r1 == 0 { // failure + panic(fmt.Errorf("error getting text metrics for preferred size calculations: %v", err)) + } + d.baseX = int(tm.tmAveCharWidth) // TODO not optimal; third reference has better way + d.baseY = int(tm.tmHeight) + + if s.spaced { + d.xmargin = muldiv(marginDialogUnits, d.baseX, 4) + d.ymargin = muldiv(marginDialogUnits, d.baseY, 8) + d.xpadding = muldiv(paddingDialogUnits, d.baseX, 4) + d.xpadding = muldiv(paddingDialogUnits, d.baseY, 8) + } + + return d +} + +func (s *sysData) endResize(d *sysSizeData) { + // redraw +} + +func (s *sysData) translateAllocationCoords(allocations []*allocation, winwidth, winheight int) { + // no translation needed on windows +} + +func (s *sysData) commitResize(c *allocation, d *sysSizeData) { + yoff := stdDlgSizes[s.ctype].yoff + if s.alternate { + yoff = stdDlgSizes[s.ctype].yoffalt + } + if yoff != 0 { + yoff = muldiv(yoff, d.baseY, 8) + } + c.y += yoff + // TODO move this here + s.setRect(c.x, c.y, c.width, c.height) +} + +func (s *sysData) getAuxResizeInfo(d *sysSizeData) { + // do nothing +} + // For Windows, Microsoft just hands you a list of preferred control sizes as part of the MSDN documentation and tells you to roll with it. // These sizes are given in "dialog units", which are independent of the font in use. // We need to convert these into standard pixels, which requires we get the device context of the OS window. @@ -83,8 +149,34 @@ var ( _releaseDC = user32.NewProc("ReleaseDC") ) +func getTextDC(hwnd _HWND) (dc _HANDLE) { + var tm _TEXTMETRICS + + r1, _, err := _getDC.Call(uintptr(hwnd)) + if r1 == 0 { // failure + panic(fmt.Errorf("error getting DC for preferred size calculations: %v", err)) + } + dc = _HANDLE(r1) + r1, _, err = _selectObject.Call( + uintptr(dc), + uintptr(controlFont)) + if r1 == 0 { // failure + panic(fmt.Errorf("error loading control font into device context for preferred size calculation: %v", err)) + } + return dc +} + +func releaseTextDC(hwnd _HWND, dc _HANDLE) { + r1, _, err = _releaseDC.Call( + uintptr(hwnd), + uintptr(dc)) + if r1 == 0 { // failure + panic(fmt.Errorf("error releasing DC for preferred size calculations: %v", err)) + } +} + // This function runs on uitask; call the functions directly. -func (s *sysData) preferredSize() (width int, height int, yoff int) { +func (s *sysData) preferredSize(d *sysSizeData) (width int, height int) { // the preferred size of an Area is its size if stdDlgSizes[s.ctype].area { return s.areawidth, s.areaheight, 0 // no yoff for areas @@ -105,53 +197,15 @@ func (s *sysData) preferredSize() (width int, height int, yoff int) { println("message failed; falling back") } - var dc _HANDLE - var tm _TEXTMETRICS - var baseX, baseY int - - r1, _, err := _getDC.Call(uintptr(s.hwnd)) - if r1 == 0 { // failure - panic(fmt.Errorf("error getting DC for preferred size calculations: %v", err)) - } - dc = _HANDLE(r1) - r1, _, err = _selectObject.Call( - uintptr(dc), - uintptr(controlFont)) - if r1 == 0 { // failure - panic(fmt.Errorf("error loading control font into device context for preferred size calculation: %v", err)) - } - r1, _, err = _getTextMetrics.Call( - uintptr(dc), - uintptr(unsafe.Pointer(&tm))) - if r1 == 0 { // failure - panic(fmt.Errorf("error getting text metrics for preferred size calculations: %v", err)) - } - baseX = int(tm.tmAveCharWidth) // TODO not optimal; third reference has better way - baseY = int(tm.tmHeight) - r1, _, err = _releaseDC.Call( - uintptr(s.hwnd), - uintptr(dc)) - if r1 == 0 { // failure - panic(fmt.Errorf("error releasing DC for preferred size calculations: %v", err)) - } - - // now that we have the conversion factors... width = stdDlgSizes[s.ctype].width if width == 0 { width = defaultWidth } height = stdDlgSizes[s.ctype].height - width = muldiv(width, baseX, 4) // equivalent to right of rect - height = muldiv(height, baseY, 8) // equivalent to bottom of rect + width = muldiv(width, d.baseX, 4) // equivalent to right of rect + height = muldiv(height, d.baseY, 8) // equivalent to bottom of rect - yoff = stdDlgSizes[s.ctype].yoff - if s.alternate { - yoff = stdDlgSizes[s.ctype].yoffalt - } - if yoff != 0 { - yoff = muldiv(yoff, baseY, 8) - } - return width, height, yoff + return width, height } var ( @@ -124,7 +124,7 @@ func (g *Grid) make(window *sysData) error { return nil } -func (g *Grid) setRect(x int, y int, width int, height int, d *sysSizeData) (allocations []*allocation) { +func (g *Grid) allocate(x int, y int, width int, height int, d *sysSizeData) (allocations []*allocation) { max := func(a int, b int) int { if a > b { return a @@ -135,9 +135,12 @@ func (g *Grid) setRect(x int, y int, width int, height int, d *sysSizeData) (all var current *allocation // for neighboring // before we do anything, steal the margin so nested Stacks/Grids don't double down - margin := d.margin - d.margin = 0 -_=margin + xmargin := d.xmargin + ymargin := d.ymargin + d.xmargin = 0 + d.ymargin = 0 +_=xmargin +_=ymargin // 1) clear data structures for i := range g.rowheights { g.rowheights[i] = 0 @@ -85,9 +85,12 @@ func (s *Stack) allocate(x int, y int, width int, height int, d *sysSizeData) (a return nil } // before we do anything, steal the margin so nested Stacks/Grids don't double down - margin := d.margin - d.margin = 0 -_=margin + xmargin := d.xmargin + ymargin := d.ymargin + d.xmargin = 0 + d.ymargin = 0 +_=xmargin +_=ymargin // 1) get height and width of non-stretchy controls; figure out how much space is alloted to stretchy controls stretchywid = width stretchyht = height |