diff options
Diffstat (limited to 'redo')
| -rw-r--r-- | redo/area_darwin.go | 2 | ||||
| -rw-r--r-- | redo/control_darwin.go | 4 | ||||
| -rw-r--r-- | redo/control_darwin.m | 9 | ||||
| -rw-r--r-- | redo/future | 2 | ||||
| -rw-r--r-- | redo/objc_darwin.h | 2 | ||||
| -rw-r--r-- | redo/table_darwin.go | 2 |
6 files changed, 12 insertions, 9 deletions
diff --git a/redo/area_darwin.go b/redo/area_darwin.go index 970c83a..b6140b2 100644 --- a/redo/area_darwin.go +++ b/redo/area_darwin.go @@ -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 } diff --git a/redo/control_darwin.go b/redo/control_darwin.go index 55e7550..c92ed75 100644 --- a/redo/control_darwin.go +++ b/redo/control_darwin.go @@ -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, } diff --git a/redo/control_darwin.m b/redo/control_darwin.m index bc6dbe6..8765e4c 100644 --- a/redo/control_darwin.m +++ b/redo/control_darwin.m @@ -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; } diff --git a/redo/future b/redo/future index a6e63f1..dd85dcc 100644 --- a/redo/future +++ b/redo/future @@ -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 diff --git a/redo/objc_darwin.h b/redo/objc_darwin.h index 4006716..3a42017 100644 --- a/redo/objc_darwin.h +++ b/redo/objc_darwin.h @@ -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); diff --git a/redo/table_darwin.go b/redo/table_darwin.go index 64c78bd..14b2c8d 100644 --- a/redo/table_darwin.go +++ b/redo/table_darwin.go @@ -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)) |