comparison: ui/gtk/container.c
ui/gtk/container.c
- branch
- newapi
- changeset 313
- b679cc6059ab
- parent 305
- 98470af75dcf
equal
deleted
inserted
replaced
| 312:3f2b3d15668b | 313:b679cc6059ab |
|---|---|
| 264 UiObject *current = uic_current_obj(obj); | 264 UiObject *current = uic_current_obj(obj); |
| 265 UiContainer *ct = current->container; | 265 UiContainer *ct = current->container; |
| 266 UI_APPLY_LAYOUT1(current, args); | 266 UI_APPLY_LAYOUT1(current, args); |
| 267 | 267 |
| 268 GtkWidget *box = type == UI_CONTAINER_VBOX ? ui_gtk_vbox_new(args.spacing) : ui_gtk_hbox_new(args.spacing); | 268 GtkWidget *box = type == UI_CONTAINER_VBOX ? ui_gtk_vbox_new(args.spacing) : ui_gtk_hbox_new(args.spacing); |
| 269 ui_set_name_and_style(box, args.name, args.style_class); | |
| 269 GtkWidget *widget = args.margin > 0 ? box_set_margin(box, args.margin) : box; | 270 GtkWidget *widget = args.margin > 0 ? box_set_margin(box, args.margin) : box; |
| 270 ct->add(ct, widget, TRUE); | 271 ct->add(ct, widget, TRUE); |
| 271 | 272 |
| 272 UiObject *newobj = uic_object_new(obj, box); | 273 UiObject *newobj = uic_object_new(obj, box); |
| 273 newobj->container = ui_box_container(obj, box, type); | 274 newobj->container = ui_box_container(obj, box, type); |
| 301 UiObject* current = uic_current_obj(obj); | 302 UiObject* current = uic_current_obj(obj); |
| 302 UI_APPLY_LAYOUT1(current, args); | 303 UI_APPLY_LAYOUT1(current, args); |
| 303 GtkWidget *widget; | 304 GtkWidget *widget; |
| 304 | 305 |
| 305 GtkWidget *grid = create_grid(args.columnspacing, args.rowspacing); | 306 GtkWidget *grid = create_grid(args.columnspacing, args.rowspacing); |
| 307 ui_set_name_and_style(grid, args.name, args.style_class); | |
| 306 widget = box_set_margin(grid, args.margin); | 308 widget = box_set_margin(grid, args.margin); |
| 307 current->container->add(current->container, widget, TRUE); | 309 current->container->add(current->container, widget, TRUE); |
| 308 | 310 |
| 309 UiObject *newobj = uic_object_new(obj, grid); | 311 UiObject *newobj = uic_object_new(obj, grid); |
| 310 newobj->container = ui_grid_container(obj, grid); | 312 newobj->container = ui_grid_container(obj, grid); |
| 317 UIWIDGET ui_scrolledwindow_create(UiObject* obj, UiFrameArgs args) { | 319 UIWIDGET ui_scrolledwindow_create(UiObject* obj, UiFrameArgs args) { |
| 318 UiObject* current = uic_current_obj(obj); | 320 UiObject* current = uic_current_obj(obj); |
| 319 UI_APPLY_LAYOUT1(current, args); | 321 UI_APPLY_LAYOUT1(current, args); |
| 320 | 322 |
| 321 GtkWidget *sw = SCROLLEDWINDOW_NEW(); | 323 GtkWidget *sw = SCROLLEDWINDOW_NEW(); |
| 324 ui_set_name_and_style(sw, args.name, args.style_class); | |
| 322 UiObject *newobj = uic_object_new(obj, sw); | 325 UiObject *newobj = uic_object_new(obj, sw); |
| 323 newobj->container = ui_scrolledwindow_container(obj, sw); | 326 newobj->container = ui_scrolledwindow_container(obj, sw); |
| 324 uic_obj_add(obj, newobj); | 327 uic_obj_add(obj, newobj); |
| 325 | 328 |
| 326 return sw; | 329 return sw; |
