diff options
| -rw-r--r-- | ui/confview.go | 6 | ||||
| -rw-r--r-- | ui/tunnelsview.go | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/confview.go b/ui/confview.go index 6adfdb83..52883291 100644 --- a/ui/confview.go +++ b/ui/confview.go @@ -78,7 +78,9 @@ func (lsl *labelStatusLine) widgets() (walk.Widget, walk.Widget) { } func (lsl *labelStatusLine) update(state service.TunnelState) { - img, err := iconProvider.ImageForState(state, walk.Rectangle{-4, -4, lsl.label.SizeHint().Height*3/4 + 4, lsl.label.SizeHint().Height*3/4 + 4}) + labelSize := lsl.label.SizeHint() + imageRect := walk.Rectangle{0, 0, labelSize.Height, labelSize.Height} + img, err := iconProvider.ImageForState(state, imageRect) if err == nil { lsl.statusImage.SetImage(img) } @@ -112,6 +114,8 @@ func newLabelStatusLine(parent walk.Container) *labelStatusLine { lsl.statusComposite, _ = walk.NewComposite(parent) layout := walk.NewHBoxLayout() layout.SetMargins(walk.Margins{}) + layout.SetAlignment(walk.AlignHNearVNear) + layout.SetSpacing(0) lsl.statusComposite.SetLayout(layout) lsl.statusImage, _ = walk.NewImageView(lsl.statusComposite) diff --git a/ui/tunnelsview.go b/ui/tunnelsview.go index c5fe5bb5..5ad733f9 100644 --- a/ui/tunnelsview.go +++ b/ui/tunnelsview.go @@ -115,7 +115,7 @@ func (tv *TunnelsView) StyleCell(style *walk.CellStyle) { b.X = b.Height b.Width -= b.Height - canvas.DrawText(tunnel.Name, tv.Font(), 0, b, walk.TextVCenter) + canvas.DrawText(tunnel.Name, tv.Font(), 0, b, walk.TextVCenter | walk.TextSingleLine) b.X = 0 b.Width = b.Height |