Changeset aa2b32c in mainline for uspace/lib/gui/grid.h


Ignore:
Timestamp:
2013-04-29T12:44:05Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a269d05
Parents:
06b0211b (diff), 9e7898e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/gui/grid.h

    r06b0211b raa2b32c  
    3939#include <sys/types.h>
    4040#include <io/pixel.h>
    41 
    4241#include "widget.h"
    4342
    44 struct grid;
    45 typedef struct grid grid_t;
     43typedef struct {
     44        widget_t *widget;
     45        size_t cols;
     46        size_t rows;
     47} grid_cell_t;
    4648
    4749typedef struct grid {
    4850        widget_t widget;
    4951        pixel_t background;
     52        size_t cols;
    5053        size_t rows;
    51         size_t cols;
    52         widget_t **layout;
    53         void (*add)(grid_t *, widget_t *, size_t, size_t, size_t, size_t);
     54        grid_cell_t *layout;
     55        bool (*add)(struct grid *, widget_t *, size_t, size_t, size_t, size_t);
    5456} grid_t;
    5557
Note: See TracChangeset for help on using the changeset viewer.