interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Accidentally flipped margined logic on Group.

This commit is contained in:
Pietro Gagliardi 2014-10-16 18:55:27 -04:00
parent 3345ae3189
commit 7ea98fce72
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
newctrl/group_windows.go
View File

@ -57,10 +57,10 @@ func (g *group) preferredSize(d *sizing) (width, height int) {
if g.margined { if g.margined {
// unforutnately, as mentioned above, the size of a groupbox includes the label and border // unforutnately, as mentioned above, the size of a groupbox includes the label and border
// 1DLU on each side should be enough to make up for that; if not, we can change it // 1DLU on each side should be enough to make up for that; if not, we can change it
marginRectDLU(&r, -groupYMarginTop, -groupYMarginBottom, -groupXMargin, -groupXMargin, d)
} else {
// TODO make these named constants // TODO make these named constants
marginRectDLU(&r, -1, -1, -1, -1, d) marginRectDLU(&r, -1, -1, -1, -1, d)
} else {
marginRectDLU(&r, -groupYMarginTop, -groupYMarginBottom, -groupXMargin, -groupXMargin, d)
} }
return int(r.right - r.left), int(r.bottom - r.top) return int(r.right - r.left), int(r.bottom - r.top)
} }
@ -81,9 +81,9 @@ func (g *group) resize(x int, y int, width int, height int, d *sizing) {
r.bottom = C.LONG(height) r.bottom = C.LONG(height)
if g.margined { if g.margined {
// see above // see above
marginRectDLU(&r, 1, 1, 1, 1, d)
} else {
marginRectDLU(&r, groupYMarginTop, groupYMarginBottom, groupXMargin, groupXMargin, d) marginRectDLU(&r, groupYMarginTop, groupYMarginBottom, groupXMargin, groupXMargin, d)
} else {
marginRectDLU(&r, 1, 1, 1, 1, d)
} }
g.child.resize(int(r.left), int(r.top), int(r.right - r.left), int(r.bottom - r.top), d) g.child.resize(int(r.left), int(r.top), int(r.right - r.left), int(r.bottom - r.top), d)
} }