From 6000be26591cc29230783206db54f6f4b6934a40 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 1 May 2019 13:57:44 +0200 Subject: ui: rework margins --- ui/tunnelspage.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'ui/tunnelspage.go') diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go index 8650ece6..a305496e 100644 --- a/ui/tunnelspage.go +++ b/ui/tunnelspage.go @@ -43,7 +43,9 @@ func NewTunnelsPage() (*TunnelsPage, error) { tp.SetLayout(walk.NewHBoxLayout()) tunnelsContainer, _ := walk.NewComposite(tp) - tunnelsContainer.SetLayout(walk.NewVBoxLayout()) + vlayout := walk.NewVBoxLayout() + vlayout.SetMargins(walk.Margins{}) + tunnelsContainer.SetLayout(vlayout) //TODO: deal with remaining disposables in case the next line fails @@ -58,7 +60,9 @@ func NewTunnelsPage() (*TunnelsPage, error) { // HACK: Because of https://github.com/lxn/walk/issues/481 // we need to put the ToolBar into its own Composite. toolBarContainer, _ := walk.NewComposite(tunnelsContainer) - toolBarContainer.SetLayout(walk.NewHBoxLayout()) + hlayout := walk.NewHBoxLayout() + hlayout.SetMargins(walk.Margins{}) + toolBarContainer.SetLayout(hlayout) tunnelsToolBar, _ := walk.NewToolBarWithOrientationAndButtonStyle(toolBarContainer, walk.Horizontal, walk.ToolBarButtonTextOnly) @@ -94,7 +98,9 @@ func NewTunnelsPage() (*TunnelsPage, error) { } currentTunnelContainer, _ := walk.NewComposite(tp) - currentTunnelContainer.SetLayout(walk.NewVBoxLayout()) + vlayout = walk.NewVBoxLayout() + vlayout.SetMargins(walk.Margins{}) + currentTunnelContainer.SetLayout(vlayout) tp.Layout().(interface{ SetStretchFactor(walk.Widget, int) error }).SetStretchFactor(currentTunnelContainer, 10) tp.confView, _ = NewConfView(currentTunnelContainer) -- cgit v1.2.3-59-g8ed1b