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

Changed Windows sysData.preferredSize() to panic on error, since the other platforms don't return explicit errors either.

This commit is contained in:
Pietro Gagliardi 2014-03-09 19:34:43 -04:00
parent 5a7cfedb84
commit ab11900d43
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
prefsize_windows.go
View File

@ -2,6 +2,7 @@
package ui package ui
import ( import (
"fmt"
// "syscall" // "syscall"
"unsafe" "unsafe"
) )
@ -74,14 +75,14 @@ func (s *sysData) preferredSize() (width int, height int) {
// TODO use GetDC() and not GetWindowDC()? // TODO use GetDC() and not GetWindowDC()?
r1, _, err := _getWindowDC.Call(uintptr(s.hwnd)) r1, _, err := _getWindowDC.Call(uintptr(s.hwnd))
if r1 == 0 { // failure if r1 == 0 { // failure
panic(err) // TODO return it instead panic(fmt.Errorf("error getting DC for preferred size calculations: %v", err))
} }
dc = _HANDLE(r1) dc = _HANDLE(r1)
r1, _, err = _getTextMetrics.Call( r1, _, err = _getTextMetrics.Call(
uintptr(dc), uintptr(dc),
uintptr(unsafe.Pointer(&tm))) uintptr(unsafe.Pointer(&tm)))
if r1 == 0 { // failure if r1 == 0 { // failure
panic(err) // TODO return it instead 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 baseX = int(tm.tmAveCharWidth) // TODO not optimal; third reference has better way
baseY = int(tm.tmHeight) baseY = int(tm.tmHeight)
@ -89,7 +90,7 @@ func (s *sysData) preferredSize() (width int, height int) {
uintptr(s.hwnd), uintptr(s.hwnd),
uintptr(dc)) uintptr(dc))
if r1 == 0 { // failure if r1 == 0 { // failure
panic(err) // TODO return it instead panic(fmt.Errorf("error releasing DC for preferred size calculations: %v", err))
} }
// now that we have the conversion factors... // now that we have the conversion factors...