minor alignment clean up

crypto-power · Sep 23, 2023 · 2516f3a · 2516f3a
1 parent cdc757c
commit 2516f3a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/ui/cryptomaterial/image.go b/ui/cryptomaterial/image.go
@@ -57,7 +57,7 @@ func (img *Image) LayoutSize(gtx C, size unit.Dp) D {
 }
 
 func (img *Image) LayoutSize2(gtx C, width, height unit.Dp) D {
-	dst := image.NewRGBA(image.Rectangle{Max: image.Point{X: int(width * 2), Y: int(height * 2)}})
+	dst := image.NewRGBA(image.Rectangle{Max: image.Point{X: int(width), Y: int(height * 2)}})
 	draw.BiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Src, nil)
 
 	i := widget.Image{Src: paint.NewImageOp(dst)}

diff --git a/ui/page/root/overview_page.go b/ui/page/root/overview_page.go
@@ -189,8 +189,8 @@ func (pg *OverviewPage) sliderLayout(gtx C) D {
 		Orientation: layout.Horizontal,
 		Direction:   layout.Center,
 	}.Layout(gtx,
-		layout.Rigid(pg.supportedCoinSliderLayout),
-		layout.Rigid(func(gtx C) D {
+		layout.Flexed(.5, pg.supportedCoinSliderLayout),
+		layout.Flexed(.5, func(gtx C) D {
 			return layout.Inset{Left: values.MarginPadding10}.Layout(gtx, pg.mixerSliderLayout)
 		}),
 	)
@@ -234,17 +234,10 @@ func (pg *OverviewPage) supportedCoinSliderLayout(gtx C) D {
 	return pg.coinSlider.Layout(gtx, sliderWidget)
 }
 
-func (pg *OverviewPage) mixerSliderLayout(gtx C) D {
-	sliderWidget := []layout.Widget{
-		pg.mixerLayout,
-	}
-	return pg.mixerSlider.Layout(gtx, sliderWidget)
-}
-
 func (pg *OverviewPage) supportedCoinItemLayout(gtx C, item supportedCoinSliderItem) D {
 	return layout.Stack{}.Layout(gtx,
 		layout.Stacked(func(gtx C) D {
-			return item.BackgroundImage.LayoutSize2(gtx, values.MarginPadding368, values.MarginPadding221)
+			return item.BackgroundImage.LayoutSize2(gtx, unit.Dp(gtx.Constraints.Max.X), values.MarginPadding221)
 		}),
 		layout.Expanded(func(gtx C) D {
 			col := pg.Theme.Color.InvText
@@ -291,10 +284,17 @@ func (pg *OverviewPage) supportedCoinItemLayout(gtx C, item supportedCoinSliderI
 	)
 }
 
+func (pg *OverviewPage) mixerSliderLayout(gtx C) D {
+	sliderWidget := []layout.Widget{
+		pg.mixerLayout,
+	}
+	return pg.mixerSlider.Layout(gtx, sliderWidget)
+}
+
 func (pg *OverviewPage) mixerLayout(gtx C) D {
 	r := 8
 	return cryptomaterial.LinearLayout{
-		Width:       gtx.Dp(values.MarginPadding368),
+		Width:       gtx.Constraints.Max.X,
 		Height:      gtx.Dp(values.MarginPadding221),
 		Orientation: layout.Vertical,
 		Padding:     layout.UniformInset(values.MarginPadding15),
@@ -550,16 +550,21 @@ func (pg *OverviewPage) txStakingSection(gtx C) D {
 		Orientation: layout.Horizontal,
 		Direction:   layout.Center,
 	}.Layout(gtx,
-		layout.Rigid(func(gtx C) D {
-			return pg.pageContentWrapper(gtx, "Recent Proposals", func(gtx C) D {
-				return pg.centerLayout(gtx, values.MarginPadding10, values.MarginPadding10, func(gtx C) D {
-					return pg.Theme.Body1("No recent transaction").Layout(gtx)
+		layout.Flexed(.5, func(gtx C) D {
+			return layout.Inset{Right: values.MarginPadding10}.Layout(gtx, func(gtx C) D {
+				return pg.pageContentWrapper(gtx, "Recent Proposals", func(gtx C) D {
+					return pg.centerLayout(gtx, values.MarginPadding10, values.MarginPadding10, func(gtx C) D {
+						gtx.Constraints.Min.X = gtx.Constraints.Max.X
+						return pg.Theme.Body1("No recent transaction").Layout(gtx)
+					})
 				})
 			})
 		}),
-		layout.Rigid(func(gtx C) D {
+		layout.Flexed(.5, func(gtx C) D {
 			return pg.pageContentWrapper(gtx, "Staking Activity", func(gtx C) D {
 				return pg.centerLayout(gtx, values.MarginPadding10, values.MarginPadding10, func(gtx C) D {
+					gtx.Constraints.Min.X = gtx.Constraints.Max.X
+
 					return pg.Theme.Body1("No recent Staking Activity").Layout(gtx)
 				})
 			})