diff options
| author |   Alexander Neumann <alexander.neumann@picos-software.com> | 2020-09-01 12:22:29 +0200 |
|---|---|---|
| committer | Alexander Neumann <alexander.neumann@picos-software.com> | 2020-09-01 12:22:29 +0200 |
| commit | 97e648c9f710630ce59c4617693baf14dcc103c8 (patch) | |
| tree | 42deb2033dae956a82236cbed4c43ee06150edbd | |
| parent | Button: Fix weird BCM_GETIDEALSIZE issue with empty text (diff) | |
| download | wireguard-windows-97e648c9f710630ce59c4617693baf14dcc103c8.tar.xz wireguard-windows-97e648c9f710630ce59c4617693baf14dcc103c8.zip | |
GroupBox: Fix title clipping
| -rw-r--r-- | groupbox.go | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/groupbox.go b/groupbox.go index 51e62d70..5a38b00d 100644 --- a/groupbox.go +++ b/groupbox.go @@ -339,12 +339,11 @@ func (gb *GroupBox) WndProc(hwnd win.HWND, msg uint32, wParam, lParam uintptr) u break } - offset := gb.headerHeight / 4 wbcb := gb.WidgetBase.ClientBoundsPixels() if !win.MoveWindow( gb.hWndGroupBox, int32(wbcb.X), - int32(wbcb.Y-offset), + int32(wbcb.Y), int32(wbcb.Width), int32(wbcb.Height), true) { @@ -364,9 +363,7 @@ func (gb *GroupBox) WndProc(hwnd win.HWND, msg uint32, wParam, lParam uintptr) u gb.checkBox.SetBoundsPixels(Rectangle{x, gb.headerHeight, s.Width, s.Height}) } - gbcb := gb.ClientBoundsPixels() - gbcb.Y -= offset - gb.composite.SetBoundsPixels(gbcb) + gb.composite.SetBoundsPixels(gb.ClientBoundsPixels()) } } @@ -407,7 +404,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 + IntFrom96DPI(5, li.ctx.dpi) + min.Height += li.compositePos.Y return min } @@ -421,7 +418,7 @@ func (li *groupBoxLayoutItem) HasHeightForWidth() bool { } func (li *groupBoxLayoutItem) HeightForWidth(width int) int { - return li.children[0].(HeightForWidther).HeightForWidth(width-li.compositePos.X*2) + li.compositePos.Y + IntFrom96DPI(5, li.ctx.dpi) + return li.children[0].(HeightForWidther).HeightForWidth(width-li.compositePos.X*2) + li.compositePos.Y } func (li *groupBoxLayoutItem) IdealSize() Size { @@ -434,7 +431,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 - IntFrom96DPI(5, li.ctx.dpi)}, + 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}, }, } } |