Removed borders from Areas on Mac OS X.
This commit is contained in:
parent
4e46975906
commit
5679d02d1e
|
@ -23,7 +23,7 @@ func newArea(ab *areabase) Area {
|
|||
areabase: ab,
|
||||
}
|
||||
a._id = C.newArea(unsafe.Pointer(a))
|
||||
a.scroller = newScroller(a._id)
|
||||
a.scroller = newScroller(a._id, false) // no border on Area
|
||||
a.SetSize(a.width, a.height)
|
||||
return a
|
||||
}
|
||||
|
|
|
@ -42,8 +42,8 @@ type scroller struct {
|
|||
id C.id
|
||||
}
|
||||
|
||||
func newScroller(child C.id) *scroller {
|
||||
id := C.newScrollView(child)
|
||||
func newScroller(child C.id, bordered bool) *scroller {
|
||||
id := C.newScrollView(child, toBOOL(bordered))
|
||||
s := &scroller{
|
||||
id: id,
|
||||
}
|
||||
|
|
|
@ -43,9 +43,7 @@ struct xsize controlPreferredSize(id control)
|
|||
return s;
|
||||
}
|
||||
|
||||
// TODO verify this when we add more scrolling controls
|
||||
// TODO no borders on Area
|
||||
id newScrollView(id content)
|
||||
id newScrollView(id content, BOOL bordered)
|
||||
{
|
||||
NSScrollView *sv;
|
||||
|
||||
|
@ -54,6 +52,9 @@ id newScrollView(id content)
|
|||
[sv setHasHorizontalScroller:YES];
|
||||
[sv setHasVerticalScroller:YES];
|
||||
[sv setAutohidesScrollers:YES];
|
||||
[sv setBorderType:NSBezelBorder];
|
||||
if (bordered)
|
||||
[sv setBorderType:NSBezelBorder];
|
||||
else
|
||||
[sv setBorderType:NSNoBorder];
|
||||
return (id) sv;
|
||||
}
|
||||
|
|
|
@ -19,6 +19,8 @@ Tab
|
|||
investigate close buttons (especially for LikeTab)
|
||||
Area
|
||||
Repaint(rect image.Rectangle)
|
||||
Tree
|
||||
Mac OS X: make sure newScrollView() has the correct parameters for Table and Tree
|
||||
|
||||
so I don't forget, some TODOs:
|
||||
windows
|
||||
|
|
|
@ -91,7 +91,7 @@ extern void controlSetHidden(id, BOOL);
|
|||
extern void setStandardControlFont(id);
|
||||
extern void setSmallControlFont(id);
|
||||
extern struct xsize controlPreferredSize(id);
|
||||
extern id newScrollView(id);
|
||||
extern id newScrollView(id, BOOL);
|
||||
|
||||
/* xsizing_darwin.m */
|
||||
extern struct xalignment alignmentInfo(id, struct xrect);
|
||||
|
|
|
@ -22,7 +22,7 @@ func finishNewTable(b *tablebase, ty reflect.Type) Table {
|
|||
id := C.newTable()
|
||||
t := &table{
|
||||
_id: id,
|
||||
scroller: newScroller(id),
|
||||
scroller: newScroller(id, true), // border on Table
|
||||
tablebase: b,
|
||||
}
|
||||
C.tableMakeDataSource(t._id, unsafe.Pointer(t))
|
||||
|
|
Loading…
Reference in New Issue