DPI: Merge SizePixels to Size

Signed-off-by: Simon Rozman <simon@rozman.si>

Author: rozmansi

bitmap.go

@@ -22,7 +22,7 @@ const inchesPerMeter = 39.37007874
 type Bitmap struct {
 	hBmp       win.HBITMAP
 	hPackedDIB win.HGLOBAL
-	size       SizePixels
+	size       Size // in native pixels
 	dpi        int
 }
 
@@ -39,33 +39,34 @@ func BitmapFrom(src interface{}, dpi int) (*Bitmap, error) {
 	return iconCache.Bitmap(img, dpi)
 }
 
-// NewBitmap creates an opaque bitmap with given size at screen DPI.
+// NewBitmap creates an opaque bitmap with given size in 1/96" units at screen DPI.
 //
 // Deprecated: Newer applications should use NewBitmapForDPI.
 func NewBitmap(size Size) (*Bitmap, error) {
 	dpi := screenDPI()
 	return newBitmap(SizeFrom96DPI(size, dpi), false, dpi)
 }
 
-// NewBitmapForDPI creates an opaque bitmap with given size and DPI.
-func NewBitmapForDPI(size SizePixels, dpi int) (*Bitmap, error) {
+// NewBitmapForDPI creates an opaque bitmap with given size in native pixels and DPI.
+func NewBitmapForDPI(size Size, dpi int) (*Bitmap, error) {
 	return newBitmap(size, false, dpi)
 }
 
-// NewBitmapWithTransparentPixels creates a transparent bitmap with given size at screen DPI.
+// NewBitmapWithTransparentPixels creates a transparent bitmap with given size in 1/96" units at screen DPI.
 //
 // Deprecated: Newer applications should use NewBitmapWithTransparentPixelsForDPI.
 func NewBitmapWithTransparentPixels(size Size) (*Bitmap, error) {
 	dpi := screenDPI()
 	return newBitmap(SizeFrom96DPI(size, dpi), true, dpi)
 }
 
-// NewBitmapWithTransparentPixelsForDPI creates a transparent bitmap with given size and DPI.
-func NewBitmapWithTransparentPixelsForDPI(size SizePixels, dpi int) (*Bitmap, error) {
+// NewBitmapWithTransparentPixelsForDPI creates a transparent bitmap with given size in native pixels and DPI.
+func NewBitmapWithTransparentPixelsForDPI(size Size, dpi int) (*Bitmap, error) {
 	return newBitmap(size, true, dpi)
 }
 
-func newBitmap(size SizePixels, transparent bool, dpi int) (bmp *Bitmap, err error) {
+// newBitmap creates a bitmap with given size in native pixels and DPI.
+func newBitmap(size Size, transparent bool, dpi int) (bmp *Bitmap, err error) {
 	err = withCompatibleDC(func(hdc win.HDC) error {
 		bufSize := int(size.Width * size.Height * 4)
 
@@ -194,7 +195,8 @@ func newBitmapFromResource(res *uint16, dpi int) (bm *Bitmap, err error) {
 	return
 }
 
-func NewBitmapFromImageWithSize(image Image, size SizePixels) (*Bitmap, error) {
+// NewBitmapFromImageWithSize creates a bitmap with given size in native units and paints the image on it streched.
+func NewBitmapFromImageWithSize(image Image, size Size) (*Bitmap, error) {
 	var disposables Disposables
 	defer disposables.Treat()
 
@@ -231,15 +233,17 @@ func NewBitmapFromWindow(window Window) (*Bitmap, error) {
 	return newBitmapFromHBITMAP(hBmp, window.DPI())
 }
 
-// NewBitmapFromIcon creates a new bitmap with given size and 96dpi and paints the icon on it.
+// NewBitmapFromIcon creates a new bitmap with given size in native pixels and 96dpi and paints the
+// icon on it.
 //
 // Deprecated: Newer applications should use NewBitmapFromIconForDPI.
-func NewBitmapFromIcon(icon *Icon, size SizePixels) (*Bitmap, error) {
+func NewBitmapFromIcon(icon *Icon, size Size) (*Bitmap, error) {
 	return NewBitmapFromIconForDPI(icon, size, 96)
 }
 
-// NewBitmapFromIconForDPI creates a new bitmap with given size and DPI and paints the icon on it.
-func NewBitmapFromIconForDPI(icon *Icon, size SizePixels, dpi int) (*Bitmap, error) {
+// NewBitmapFromIconForDPI creates a new bitmap with given size in native pixels and DPI and paints
+// the icon on it.
+func NewBitmapFromIconForDPI(icon *Icon, size Size, dpi int) (*Bitmap, error) {
 	hBmp, err := hBitmapFromIcon(icon, size, dpi)
 	if err != nil {
 		return nil, err
@@ -420,7 +424,7 @@ func newBitmapFromHBITMAP(hBmp win.HBITMAP, dpi int) (bmp *Bitmap, err error) {
 	return &Bitmap{
 		hBmp:       hBmp,
 		hPackedDIB: hPackedDIB,
-		size: SizePixels{
+		size: Size{
 			int(bmih.BiWidth),
 			int(bmih.BiHeight),
 		},
@@ -501,7 +505,9 @@ func hBitmapFromWindow(window Window) (win.HBITMAP, error) {
 	return hBmp, nil
 }
 
-func hBitmapFromIcon(icon *Icon, size SizePixels, dpi int) (win.HBITMAP, error) {
+// hBitmapFromIcon creates a new win.HBITMAP with given size in native pixels and DPI, and paints
+// the icon on it stretched.
+func hBitmapFromIcon(icon *Icon, size Size, dpi int) (win.HBITMAP, error) {
 	hdc := win.GetDC(0)
 	defer win.ReleaseDC(0, hdc)
 

boxlayout.go

@@ -102,7 +102,7 @@ func (l *BoxLayout) SetStretchFactor(widget Widget, factor int) error {
 
 func (l *BoxLayout) CreateLayoutItem(ctx *LayoutContext) ContainerLayoutItem {
 	li := &boxLayoutItem{
-		size2MinSize:       make(map[SizePixels]SizePixels),
+		size2MinSize:       make(map[Size]Size),
 		orientation:        l.orientation,
 		hwnd2StretchFactor: make(map[win.HWND]int),
 	}
@@ -157,7 +157,7 @@ func (l boxLayoutItemInfoList) Swap(i, j int) {
 type boxLayoutItem struct {
 	ContainerLayoutItemBase
 	mutex              sync.Mutex
-	size2MinSize       map[SizePixels]SizePixels
+	size2MinSize       map[Size]Size // in native pixels
 	orientation        Orientation
 	hwnd2StretchFactor map[win.HWND]int
 }
@@ -166,19 +166,19 @@ func (li *boxLayoutItem) LayoutFlags() LayoutFlags {
 	return boxLayoutFlags(li.orientation, li.children)
 }
 
-func (li *boxLayoutItem) IdealSize() SizePixels {
+func (li *boxLayoutItem) IdealSize() Size {
 	return li.MinSize()
 }
 
-func (li *boxLayoutItem) MinSize() SizePixels {
+func (li *boxLayoutItem) MinSize() Size {
 	return li.MinSizeForSize(li.geometry.ClientSize)
 }
 
 func (li *boxLayoutItem) HeightForWidth(width int) int {
-	return li.MinSizeForSize(SizePixels{width, li.geometry.ClientSize.Height}).Height
+	return li.MinSizeForSize(Size{width, li.geometry.ClientSize.Height}).Height
 }
 
-func (li *boxLayoutItem) MinSizeForSize(size SizePixels) SizePixels {
+func (li *boxLayoutItem) MinSizeForSize(size Size) Size {
 	li.mutex.Lock()
 	defer li.mutex.Unlock()
 
@@ -192,7 +192,7 @@ func (li *boxLayoutItem) MinSizeForSize(size SizePixels) SizePixels {
 
 	margins := MarginsFrom96DPI(li.margins96dpi, li.ctx.dpi)
 	spacing := IntFrom96DPI(li.spacing96dpi, li.ctx.dpi)
-	s := SizePixels{margins.HNear + margins.HFar, margins.VNear + margins.VFar}
+	s := Size{margins.HNear + margins.HFar, margins.VNear + margins.VFar}
 
 	var maxSecondary int
 	for _, item := range items {
@@ -318,7 +318,7 @@ func boxLayoutItems(container ContainerLayoutItem, items []LayoutItem, orientati
 		flags := item.LayoutFlags()
 
 		max := geometry.MaxSize
-		var pref SizePixels
+		var pref Size
 		if hfw, ok := item.(HeightForWidther); !ok || !hfw.HasHeightForWidth() {
 			if is, ok := item.(IdealSizer); ok {
 				pref = is.IdealSize()

brush.go

@@ -382,9 +382,9 @@ func NewGradientBrush(vertexes []GradientVertex, triangles []GradientTriangle) (
 }
 
 func newGradientBrush(vertexes []GradientVertex, triangles []GradientTriangle, orientation gradientOrientation) (*GradientBrush, error) {
-	var size SizePixels
+	var size Size
 	for _, v := range vertexes {
-		size = maxSizePixels(size, SizePixels{int(v.X), int(v.Y)})
+		size = maxSize(size, Size{int(v.X), int(v.Y)})
 	}
 
 	gb := &GradientBrush{vertexes: vertexes, triangles: triangles, orientation: orientation, absolute: size.Width > 1 || size.Height > 1}
@@ -414,7 +414,8 @@ func (*GradientBrush) simple() bool {
 	return false
 }
 
-func (b *GradientBrush) create(size SizePixels) (*BitmapBrush, error) {
+// create creates a gradient brush at given size in native pixels.
+func (b *GradientBrush) create(size Size) (*BitmapBrush, error) {
 	var disposables Disposables
 	defer disposables.Treat()
 

button.go

@@ -218,12 +218,13 @@ func (b *Button) WndProc(hwnd win.HWND, msg uint32, wParam, lParam uintptr) uint
 	return b.WidgetBase.WndProc(hwnd, msg, wParam, lParam)
 }
 
-func (b *Button) idealSize() SizePixels {
+// idealSize returns ideal button size in native pixels.
+func (b *Button) idealSize() Size {
 	var s win.SIZE
 
 	b.SendMessage(win.BCM_GETIDEALSIZE, 0, uintptr(unsafe.Pointer(&s)))
 
-	return maxSizePixels(sizeFromSIZE(s), b.dialogBaseUnitsToPixels(SizeDBU{50, 14}))
+	return maxSize(sizeFromSIZE(s), b.dialogBaseUnitsToPixels(SizeDBU{50, 14}))
 }
 
 func (b *Button) CreateLayoutItem(ctx *LayoutContext) LayoutItem {
@@ -234,17 +235,17 @@ func (b *Button) CreateLayoutItem(ctx *LayoutContext) LayoutItem {
 
 type buttonLayoutItem struct {
 	LayoutItemBase
-	idealSize SizePixels
+	idealSize Size // in native pixels
 }
 
 func (li *buttonLayoutItem) LayoutFlags() LayoutFlags {
 	return 0
 }
 
-func (li *buttonLayoutItem) IdealSize() SizePixels {
+func (li *buttonLayoutItem) IdealSize() Size {
 	return li.MinSize()
 }
 
-func (li *buttonLayoutItem) MinSize() SizePixels {
+func (li *buttonLayoutItem) MinSize() Size {
 	return li.idealSize
 }

canvas.go

@@ -446,7 +446,7 @@ func (c *Canvas) roundedRectangle(brush Brush, pen Pen, bounds Rectangle, ellips
 }
 
 // roundedRectanglePixels draws a rounded rectangle in native pixels.
-func (c *Canvas) roundedRectanglePixels(brush Brush, pen Pen, bounds RectanglePixels, ellipseSize SizePixels, sizeCorrection int) error {
+func (c *Canvas) roundedRectanglePixels(brush Brush, pen Pen, bounds RectanglePixels, ellipseSize Size, sizeCorrection int) error {
 	return c.withBrushAndPen(brush, pen, func() error {
 		if !win.RoundRect(
 			c.hdc,
@@ -464,19 +464,30 @@ func (c *Canvas) roundedRectanglePixels(brush Brush, pen Pen, bounds RectanglePi
 	})
 }
 
+// DrawRoundedRectangle draws a rounded rectangle in 1/96" units. sizeCorrection parameter is in native
+// pixels.
+//
+// Deprecated: Newer applications should use DrawRoundedRectanglePixels.
 func (c *Canvas) DrawRoundedRectangle(pen Pen, bounds Rectangle, ellipseSize Size) error {
 	return c.roundedRectangle(nullBrushSingleton, pen, bounds, ellipseSize, 0)
 }
 
-func (c *Canvas) DrawRoundedRectanglePixels(pen Pen, bounds RectanglePixels, ellipseSize SizePixels) error {
+// DrawRoundedRectanglePixels draws a rounded rectangle in native pixels.
+func (c *Canvas) DrawRoundedRectanglePixels(pen Pen, bounds RectanglePixels, ellipseSize Size) error {
 	return c.roundedRectanglePixels(nullBrushSingleton, pen, bounds, ellipseSize, 0)
 }
 
+// FillRoundedRectangle draws a filled rounded rectangle in 1/96" units. sizeCorrection parameter
+// is in native
+// pixels.
+//
+// Deprecated: Newer applications should use FillRoundedRectanglePixels.
 func (c *Canvas) FillRoundedRectangle(brush Brush, bounds Rectangle, ellipseSize Size) error {
 	return c.roundedRectangle(brush, nullPenSingleton, bounds, ellipseSize, 1)
 }
 
-func (c *Canvas) FillRoundedRectanglePixels(brush Brush, bounds RectanglePixels, ellipseSize SizePixels) error {
+// FillRoundedRectanglePixels draws a filled rounded rectangle in native pixels.
+func (c *Canvas) FillRoundedRectanglePixels(brush Brush, bounds RectanglePixels, ellipseSize Size) error {
 	return c.roundedRectanglePixels(brush, nullPenSingleton, bounds, ellipseSize, 1)
 }
 

checkbox.go

@@ -20,7 +20,7 @@ const (
 	CheckIndeterminate CheckState = win.BST_INDETERMINATE
 )
 
-var checkBoxCheckSize SizePixels
+var checkBoxCheckSize Size // in native pixels
 
 type CheckBox struct {
 	Button

combobox.go

@@ -713,24 +713,24 @@ func (cb *ComboBox) CreateLayoutItem(ctx *LayoutContext) LayoutItem {
 
 	return &comboBoxLayoutItem{
 		layoutFlags: layoutFlags,
-		idealSize:   SizePixels{w, h},
+		idealSize:   Size{w, h},
 	}
 }
 
 type comboBoxLayoutItem struct {
 	LayoutItemBase
 	layoutFlags LayoutFlags
-	idealSize   SizePixels
+	idealSize   Size // in native pixels
 }
 
 func (li *comboBoxLayoutItem) LayoutFlags() LayoutFlags {
 	return li.layoutFlags
 }
 
-func (li *comboBoxLayoutItem) IdealSize() SizePixels {
+func (li *comboBoxLayoutItem) IdealSize() Size {
 	return li.idealSize
 }
 
-func (li *comboBoxLayoutItem) MinSize() SizePixels {
+func (li *comboBoxLayoutItem) MinSize() Size {
 	return li.idealSize
 }

dateedit.go

@@ -256,17 +256,17 @@ func (de *DateEdit) CreateLayoutItem(ctx *LayoutContext) LayoutItem {
 
 type dateEditLayoutItem struct {
 	LayoutItemBase
-	idealSize SizePixels
+	idealSize Size // in native pixels
 }
 
 func (*dateEditLayoutItem) LayoutFlags() LayoutFlags {
 	return GrowableHorz
 }
 
-func (li *dateEditLayoutItem) IdealSize() SizePixels {
+func (li *dateEditLayoutItem) IdealSize() Size {
 	return li.idealSize
 }
 
-func (li *dateEditLayoutItem) MinSize() SizePixels {
+func (li *dateEditLayoutItem) MinSize() Size {
 	return li.idealSize
 }

dialog.go

@@ -163,9 +163,9 @@ func (dlg *Dialog) Show() {
 	}
 
 	if !willRestore {
-		var size SizePixels
+		var size Size
 		if layout := dlg.Layout(); layout != nil {
-			size = maxSizePixels(dlg.clientComposite.MinSizeHint(), dlg.MinSizePixels())
+			size = maxSize(dlg.clientComposite.MinSizeHint(), dlg.MinSizePixels())
 		} else {
 			size = dlg.SizePixels()
 		}

examples/externalwidgets/externalwidgets.go

@@ -89,7 +89,7 @@ func (li *myWidgetLayoutItem) LayoutFlags() walk.LayoutFlags {
 	return 0
 }
 
-func (li *myWidgetLayoutItem) IdealSize() walk.SizePixels {
+func (li *myWidgetLayoutItem) IdealSize() walk.Size {
 	return walk.SizeFrom96DPI(li.idealSize, li.Context().DPI())
 }