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

Merge 8badf407fe into fea45b2d5b

This commit is contained in:
Simon Ser 2021-01-02 10:22:03 -05:00 committed by GitHub
parent fea45b2d5b 8badf407fe
commit d2dfbfd0a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
darwin/grid.m
View File

@ -599,6 +599,35 @@ struct uiGrid {
[self append:gc];
}
- (void)delete:(int)n
{
gridChild *gc;
BOOL update;
int oldnh, oldnv;
gc = (gridChild *) [self->children objectAtIndex:n];
uiControlSetParent(gc.c, NULL);
uiDarwinControlSetSuperview(uiDarwinControl(gc.c), nil);
uiDarwinControlSetHuggingPriority(uiDarwinControl(gc.c), gc.oldHorzHuggingPri, NSLayoutConstraintOrientationHorizontal);
uiDarwinControlSetHuggingPriority(uiDarwinControl(gc.c), gc.oldVertHuggingPri, NSLayoutConstraintOrientationVertical);
oldnh = [self nhexpand];
oldnv = [self nvexpand];
[self->children removeObjectAtIndex:n];
update = NO;
if (gc.hexpand)
if (oldnh == 0)
update = YES;
if (gc.vexpand)
if (oldnv == 0)
update = YES;
if (update)
uiDarwinNotifyEdgeHuggingChanged(uiDarwinControl(self->g));
}
- (int)isPadded
{
return self->padded;

1
ui.h
View File

@ -1123,6 +1123,7 @@ typedef struct uiGrid uiGrid;
#define uiGrid(this) ((uiGrid *) (this))
_UI_EXTERN void uiGridAppend(uiGrid *g, uiControl *c, int left, int top, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign);
_UI_EXTERN void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign);
_UI_EXTERN void uiGridDelete(uiGrid *g, int index);
_UI_EXTERN int uiGridPadded(uiGrid *g);
_UI_EXTERN void uiGridSetPadded(uiGrid *g, int padded);
_UI_EXTERN uiGrid *uiNewGrid(void);

19
unix/grid.c
View File

@ -108,6 +108,25 @@ void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int x
g_array_append_val(g->children, gc);
}
void uiGridDelete(uiGrid *g, int index)
{
struct gridChild *gc;
GtkWidget *widget;
gc = ctrl(g, index);
widget = GTK_WIDGET(uiControlHandle(gc->c));
uiControlSetParent(gc->c, NULL);
uiUnixControlSetContainer(uiUnixControl(gc->c), g->container, TRUE);
gtk_widget_set_hexpand(widget, gc->oldhexpand);
gtk_widget_set_halign(widget, gc->oldhalign);
gtk_widget_set_vexpand(widget, gc->oldvexpand);
gtk_widget_set_valign(widget, gc->oldvalign);
g_array_remove_index(g->children, index);
}
int uiGridPadded(uiGrid *g)
{
return g->padded;

13
windows/grid.cpp
View File

@ -627,6 +627,19 @@ void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int x
add(g, gc);
}
void uiGridDelete(uiGrid *g, int index)
{
uiControl *c;
c = (*(g->children))[index]->c;
uiControlSetParent(c, NULL);
uiWindowsControlSetParentHWND(uiWindowsControl(c), NULL);
g->children->erase(g->children->begin() + index);
gridRecomputeMinMax(g);
gridArrangeChildren(g);
uiWindowsControlMinimumSizeChanged(uiWindowsControl(g));
}
int uiGridPadded(uiGrid *g)
{
return g->padded;