Merge pull request #1378 from cogentcore/svg-pixels

Misc fixes to svg usage of pixels which is now the wrong size

core/layout_test.go

@@ -62,9 +62,9 @@ func TestLayoutFramesAlignContent(t *testing.T) {
 				b := NewBody()
 				b.Styler(func(s *styles.Style) {
 					if dir == styles.Row {
-						s.Min.Y.Px(300)
+						s.Min.Y.Dp(300)
 					} else {
-						s.Min.X.Px(300)
+						s.Min.X.Dp(300)
 					}
 					s.Overflow.Set(styles.OverflowVisible)
 					s.Direction = dir
@@ -94,9 +94,9 @@ func TestLayoutFramesJustifyContent(t *testing.T) {
 				b := NewBody()
 				b.Styler(func(s *styles.Style) {
 					if dir == styles.Row {
-						s.Min.X.Px(dsz)
+						s.Min.X.Dp(dsz)
 					} else {
-						s.Min.Y.Px(dsz)
+						s.Min.Y.Dp(dsz)
 					}
 					s.Overflow.Set(styles.OverflowVisible)
 					s.Direction = dir
@@ -182,8 +182,8 @@ func plainFrames(parent Widget, grow math32.Vector2) {
 	for _, sz := range frameSizes {
 		fr := boxFrame(parent)
 		fr.Styler(func(s *styles.Style) {
-			s.Min.X.Px(sz.X)
-			s.Min.Y.Px(sz.Y)
+			s.Min.X.Dp(sz.X)
+			s.Min.Y.Dp(sz.Y)
 			s.Grow = grow
 		})
 	}

docs/docs.go

@@ -157,7 +157,7 @@ func main() {
 		}
 		for _, sz := range frameSizes {
 			core.NewFrame(fr).Styler(func(s *styles.Style) {
-				s.Min.Set(units.Px(sz.X), units.Px(sz.Y))
+				s.Min.Set(units.Dp(sz.X), units.Dp(sz.Y))
 				s.Background = colors.Scheme.Primary.Base
 			})
 		}

examples/demo/demo.go

@@ -688,7 +688,7 @@ func makeStyles(ts *core.Tabs) {
 	}
 	for _, sz := range frameSizes {
 		core.NewFrame(fr).Styler(func(s *styles.Style) {
-			s.Min.Set(units.Px(sz.X), units.Px(sz.Y))
+			s.Min.Set(units.Dp(sz.X), units.Dp(sz.Y))
 			s.Background = colors.Scheme.Primary.Base
 		})
 	}

styles/paint.go

@@ -249,7 +249,7 @@ type Stroke struct {
 func (ss *Stroke) Defaults() {
 	// stroking is off by default in svg
 	ss.Color = nil
-	ss.Width.Px(1)
+	ss.Width.Dp(1)
 	ss.MinWidth.Dot(.5)
 	ss.Cap = LineCapButt
 	ss.Join = LineJoinMiter // Miter not yet supported, but that is the default -- falls back on bevel

styles/units/value.go

@@ -8,8 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	"log/slog"
-
+	"cogentcore.org/core/base/errors"
 	"cogentcore.org/core/base/reflectx"
 	"golang.org/x/image/math/fixed"
 )
@@ -193,14 +192,13 @@ func (v *Value) SetAny(iface any, key string) error {
 		*v = val
 	case *Value:
 		*v = *val
-	default: // assume Px as an implicit default
+	default: // assume Dp as an implicit default
 		valflt, err := reflectx.ToFloat(iface)
 		if err == nil {
-			v.Set(float32(valflt), UnitPx)
+			v.Dp(float32(valflt))
 		} else {
 			err := fmt.Errorf("units.Value: could not set property %q from value: %v of type: %T: %w", key, val, val, err)
-			slog.Error(err.Error())
-			return err
+			return errors.Log(err)
 		}
 	}
 	return nil

svg/rect.go

@@ -58,7 +58,7 @@ func (g *Rect) Render(sv *SVG) {
 	bs.Style.Set(styles.BorderSolid)
 	bs.Width.Set(pc.StrokeStyle.Width)
 	bs.Color.Set(pc.StrokeStyle.Color)
-	bs.Radius.Set(units.Px(g.Radius.X))
+	bs.Radius.Set(units.Dp(g.Radius.X))
 	if g.Radius.X == 0 && g.Radius.Y == 0 {
 		pc.DrawRectangle(g.Pos.X, g.Pos.Y, g.Size.X, g.Size.Y)
 	} else {

svg/svg_test.go

@@ -80,8 +80,8 @@ func TestViewBoxParse(t *testing.T) {
 
 func TestCoreLogo(t *testing.T) {
 	sv := NewSVG(720, 720)
-	sv.PhysicalWidth.Px(256)
-	sv.PhysicalHeight.Px(256)
+	sv.PhysicalWidth.Dp(256)
+	sv.PhysicalHeight.Dp(256)
 	sv.Root.ViewBox.Size.Set(1, 1)
 
 	outer := colors.Scheme.Primary.Base // #005BC0

xyz/text2d.go

@@ -64,7 +64,7 @@ func (txt *Text2D) Defaults() {
 	txt.Pose.Scale.SetScalar(.005)
 	txt.Styles.Defaults()
 	txt.Styles.Font.Size.Pt(36)
-	txt.Styles.Margin.Set(units.Px(2))
+	txt.Styles.Margin.Set(units.Dp(2))
 	txt.Material.Bright = 4 // this is key for making e.g., a white background show up as white..
 }