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

Removed borders from Areas on Mac OS X.

This commit is contained in:
Pietro Gagliardi 2014-08-10 14:37:34 -04:00
parent 4e46975906
commit 5679d02d1e
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redo/area_darwin.go
View File

@ -23,7 +23,7 @@ func newArea(ab *areabase) Area {
areabase: ab, areabase: ab,
} }
a._id = C.newArea(unsafe.Pointer(a)) 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) a.SetSize(a.width, a.height)
return a return a
} }

4
redo/control_darwin.go
View File

@ -42,8 +42,8 @@ type scroller struct {
id C.id id C.id
} }
func newScroller(child C.id) *scroller { func newScroller(child C.id, bordered bool) *scroller {
id := C.newScrollView(child) id := C.newScrollView(child, toBOOL(bordered))
s := &scroller{ s := &scroller{
id: id, id: id,
} }

7
redo/control_darwin.m
View File

@ -43,9 +43,7 @@ struct xsize controlPreferredSize(id control)
return s; return s;
} }
// TODO verify this when we add more scrolling controls id newScrollView(id content, BOOL bordered)
// TODO no borders on Area
id newScrollView(id content)
{ {
NSScrollView *sv; NSScrollView *sv;
@ -54,6 +52,9 @@ id newScrollView(id content)
[sv setHasHorizontalScroller:YES]; [sv setHasHorizontalScroller:YES];
[sv setHasVerticalScroller:YES]; [sv setHasVerticalScroller:YES];
[sv setAutohidesScrollers:YES]; [sv setAutohidesScrollers:YES];
if (bordered)
[sv setBorderType:NSBezelBorder]; [sv setBorderType:NSBezelBorder];
else
[sv setBorderType:NSNoBorder];
return (id) sv; return (id) sv;
} }

2
redo/future
View File

@ -19,6 +19,8 @@ Tab
investigate close buttons (especially for LikeTab) investigate close buttons (especially for LikeTab)
Area Area
Repaint(rect image.Rectangle) 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: so I don't forget, some TODOs:
windows windows

2
redo/objc_darwin.h
View File

@ -91,7 +91,7 @@ extern void controlSetHidden(id, BOOL);
extern void setStandardControlFont(id); extern void setStandardControlFont(id);
extern void setSmallControlFont(id); extern void setSmallControlFont(id);
extern struct xsize controlPreferredSize(id); extern struct xsize controlPreferredSize(id);
extern id newScrollView(id); extern id newScrollView(id, BOOL);
/* xsizing_darwin.m */ /* xsizing_darwin.m */
extern struct xalignment alignmentInfo(id, struct xrect); extern struct xalignment alignmentInfo(id, struct xrect);

2
redo/table_darwin.go
View File

@ -22,7 +22,7 @@ func finishNewTable(b *tablebase, ty reflect.Type) Table {
id := C.newTable() id := C.newTable()
t := &table{ t := &table{
_id: id, _id: id,
scroller: newScroller(id), scroller: newScroller(id, true), // border on Table
tablebase: b, tablebase: b,
} }
C.tableMakeDataSource(t._id, unsafe.Pointer(t)) C.tableMakeDataSource(t._id, unsafe.Pointer(t))