interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More relayout parent work. More TODOs.

This commit is contained in:
Pietro Gagliardi 2015-08-17 19:19:02 -04:00
parent 77a293b699
commit bec9ba1ba7
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redo/reredo/darwin/box.m
View File

@ -191,7 +191,7 @@ static void relayout(uiBox *b)
[metrics release]; [metrics release];
[views release]; [views release];
uiDarwinControlRelayoutParent(uiControl(b)); uiDarwinControlRelayoutParent(uiDarwinControl(b));
} }
static void boxRelayout(uiDarwinControl *c) static void boxRelayout(uiDarwinControl *c)

2
redo/reredo/darwin/control.m
View File

@ -17,7 +17,7 @@ void uiDarwinControlRelayoutParent(uiDarwinControl *c)
p = uiControlParent(uiControl(c)); p = uiControlParent(uiControl(c));
if (p == NULL) if (p == NULL)
return; return;
(*(uiDarwinControl(p)->Relayout))(p); (*(uiDarwinControl(p)->Relayout))(uiDarwinControl(p));
} }
void osCommitShow(uiControl *c) void osCommitShow(uiControl *c)

5
redo/reredo/darwin/group.m
View File

@ -1,6 +1,9 @@
// 14 august 2015 // 14 august 2015
#import "uipriv_darwin.h" #import "uipriv_darwin.h"
// TODO
// - even with the uiDarwinControlRelayoutParent() calls, we still need to click the button twice for the ambiguity to go away
struct uiGroup { struct uiGroup {
uiDarwinControl c; uiDarwinControl c;
NSBox *box; NSBox *box;
@ -54,6 +57,7 @@ void uiGroupSetChild(uiGroup *g, uiControl *child)
uiControlSetParent(g->child, uiControl(g)); uiControlSetParent(g->child, uiControl(g));
[g->box addSubview:childView]; [g->box addSubview:childView];
layoutSingleView(g->box, childView, g->margined); layoutSingleView(g->box, childView, g->margined);
uiDarwinControlRelayoutParent(uiDarwinControl(g));
} }
} }
@ -70,6 +74,7 @@ void uiGroupSetMargined(uiGroup *g, int margined)
if (g->child != NULL) { if (g->child != NULL) {
childView = (NSView *) uiControlHandle(g->child); childView = (NSView *) uiControlHandle(g->child);
layoutSingleView(g->box, childView, g->margined); layoutSingleView(g->box, childView, g->margined);
uiDarwinControlRelayoutParent(uiDarwinControl(g));
} }
} }

2
redo/reredo/darwin/tab.m
View File

@ -60,6 +60,7 @@ void uiTabInsertAt(uiTab *t, const char *name, uintmax_t n, uiControl *child)
view = [[NSView alloc] initWithFrame:NSZeroRect]; view = [[NSView alloc] initWithFrame:NSZeroRect];
[view addSubview:childView]; [view addSubview:childView];
layoutSingleView(view, childView, 0); layoutSingleView(view, childView, 0);
uiDarwinControlRelayoutParent(uiDarwinControl(t));
[t->pages insertObject:[NSValue valueWithPointer:child] atIndex:n]; [t->pages insertObject:[NSValue valueWithPointer:child] atIndex:n];
[t->views insertObject:view atIndex:n]; [t->views insertObject:view atIndex:n];
@ -122,6 +123,7 @@ void uiTabSetMargined(uiTab *t, uintmax_t n, int margined)
child = (uiControl *) [childv pointerValue]; child = (uiControl *) [childv pointerValue];
childView = (NSView *) uiControlHandle(child); childView = (NSView *) uiControlHandle(child);
layoutSingleView(view, childView, margined); layoutSingleView(view, childView, margined);
uiDarwinControlRelayoutParent(uiDarwinControl(t));
} }
uiTab *uiNewTab(void) uiTab *uiNewTab(void)

4
redo/reredo/ui_darwin.h
View File

@ -10,7 +10,7 @@ This file assumes that you have imported <Cocoa/Cocoa.h> and "ui.h" beforehand.
typedef struct uiDarwinControl uiDarwinControl; typedef struct uiDarwinControl uiDarwinControl;
struct uiDarwinControl { struct uiDarwinControl {
uiControl c; uiControl c;
void (*Relayout)(uiControl *); void (*Relayout)(uiDarwinControl *);
}; };
_UI_EXTERN uintmax_t uiDarwinControlType(void); _UI_EXTERN uintmax_t uiDarwinControlType(void);
#define uiDarwinControl(this) ((uiDarwinControl *) uiIsA((this), uiDarwinControlType(), 1)) #define uiDarwinControl(this) ((uiDarwinControl *) uiIsA((this), uiDarwinControlType(), 1))
@ -40,7 +40,7 @@ _UI_EXTERN void uiDarwinControlRelayoutParent(uiDarwinControl *);
{ \ { \
/* do nothing */ \ /* do nothing */ \
} \ } \
static void _ ## type ## Relayout(uiControl *c) \ static void _ ## type ## Relayout(uiDarwinControl *c) \
{ \ { \
uiDarwinControlRelayoutParent(uiDarwinControl(c)); \ uiDarwinControlRelayoutParent(uiDarwinControl(c)); \
} }