diff options
| author |   Alexander Neumann <alexander.neumann@picos-software.com> | 2020-11-10 16:20:32 +0100 |
|---|---|---|
| committer | Alexander Neumann <alexander.neumann@picos-software.com> | 2020-11-10 16:20:32 +0100 |
| commit | ed9def7f58677d43b0c2ed689037a8a696eabb02 (patch) | |
| tree | fbc0c08e33b52db4e5e55006a6a66044758c7080 | |
| parent | TabWidget: Fix the fix (diff) | |
| download | wireguard-windows-ed9def7f58677d43b0c2ed689037a8a696eabb02.tar.xz wireguard-windows-ed9def7f58677d43b0c2ed689037a8a696eabb02.zip | |
GroupBox: Fix size calculation and do some cleanup
| -rw-r--r-- | groupbox.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/groupbox.go b/groupbox.go index 5a38b00d..7afee40f 100644 --- a/groupbox.go +++ b/groupbox.go @@ -362,8 +362,6 @@ func (gb *GroupBox) WndProc(hwnd win.HWND, msg uint32, wParam, lParam uintptr) u } gb.checkBox.SetBoundsPixels(Rectangle{x, gb.headerHeight, s.Width, s.Height}) } - - gb.composite.SetBoundsPixels(gb.ClientBoundsPixels()) } } @@ -380,7 +378,6 @@ func (gb *GroupBox) CreateLayoutItem(ctx *LayoutContext) LayoutItem { li := &groupBoxLayoutItem{ compositePos: compositePos, - title: gb.Title(), } gbli := CreateLayoutItemsForContainerWithContext(gb.composite, ctx) @@ -394,7 +391,6 @@ func (gb *GroupBox) CreateLayoutItem(ctx *LayoutContext) LayoutItem { type groupBoxLayoutItem struct { ContainerLayoutItemBase compositePos Point // in native pixels - title string } func (li *groupBoxLayoutItem) LayoutFlags() LayoutFlags { @@ -404,7 +400,7 @@ func (li *groupBoxLayoutItem) LayoutFlags() LayoutFlags { func (li *groupBoxLayoutItem) MinSize() Size { min := li.children[0].(MinSizer).MinSize() min.Width += li.compositePos.X * 2 - min.Height += li.compositePos.Y + min.Height += li.compositePos.Y + 2 return min } @@ -431,7 +427,7 @@ func (li *groupBoxLayoutItem) PerformLayout() []LayoutResultItem { return []LayoutResultItem{ { Item: li.children[0], - Bounds: Rectangle{X: li.compositePos.X, Y: li.compositePos.Y, Width: li.geometry.Size.Width - li.compositePos.X*2, Height: li.geometry.Size.Height - li.compositePos.Y}, + Bounds: Rectangle{X: li.compositePos.X, Y: li.compositePos.Y, Width: li.geometry.Size.Width - li.compositePos.X*2, Height: li.geometry.Size.Height - li.compositePos.Y - 4}, }, } } |