idav: comparison ui/motif/Grid.c

-:d2bd73d28ff1
+:7b3a3130be44
 //static char defaultTranslations[] = "<BtnDown>: mousedown()\n";
 static char defaultTranslations[] = "\
 <EnterWindow>:		getfocus()\n\
 <LeaveWindow>:          loosefocus()\n";
+static XtResource resources[] =
+{
+{
+gridColumnSpacing,
+gridColumnSpacing,
+XmRDimension,
+sizeof (Dimension),
+XtOffsetOf( GridRec,
+mywidget.columnspacing),
+XmRImmediate,
+(XtPointer) 0
+},
+{
+gridRowSpacing,
+gridRowSpacing,
+XmRDimension,
+sizeof (Dimension),
+XtOffsetOf( GridRec,
+mywidget.rowspacing),
+XmRImmediate,
+(XtPointer) 0
+},
+{
+gridMargin,
+gridMargin,
+XmRDimension,
+sizeof (Dimension),
+XtOffsetOf( GridRec,
+mywidget.margin),
+XmRImmediate,
+(XtPointer) 0
+}
+};
 ///*
 static XtResource constraints[] =
 {
 {
 sizeof (Boolean),
 XtOffsetOf( GridConstraintRec,
 grid.vfill),
 XmRImmediate,
 (XtPointer) 0
-}
+},
+{
+gridMinWidth,
+gridMinWidth,
+XmRDimension,
+sizeof (Dimension),
+XtOffsetOf( GridConstraintRec,
+grid.min_width),
+XmRImmediate,
+(XtPointer) 0
+}
 };
 //*/
-//static XtResource constraints[] = {};
 GridClassRec gridClassRec = {
 // Core Class
 {
 //(WidgetClass)&constraintClassRec,   // superclass
 (WidgetClass)&xmManagerClassRec,
 "Grid",                       // class_name
-sizeof(GridRec),          // widget_size
+sizeof(GridRec),              // widget_size
-grid_class_initialize,    // class_initialize
+grid_class_initialize,        // class_initialize
 NULL,                         // class_part_initialize
 FALSE,                        // class_inited
-(XtInitProc)grid_initialize,          // initialize
+(XtInitProc)grid_initialize,  // initialize
 NULL,                         // initialize_hook
-grid_realize,             // realize
+grid_realize,                 // realize
-actionslist,                         // actions
+actionslist,                  // actions
-XtNumber(actionslist),                            // num_actions
+XtNumber(actionslist),        // num_actions
-NULL,                         // resources
+resources,                    // resources
-0,                            // num_resources
+XtNumber(resources),          // num_resources
 NULLQUARK,                    // xrm_class
 True,                         // compress_motion
 True,                         // compress_exposure
 True,                         // compress_enterleave
 False,                        // visible_interest
 NULL,  /* extension */
 },
 // XmManager Class
 ///*
 {
-NULL,
+XtInheritTranslations,
 NULL,
 0,
 NULL,
 0,
-NULL,
+XmInheritParentProcess,
 NULL
 },
 //*/
 // MyWidget Class
 {
 int num_cols_expanding = 0;
 int num_rows_expanding = 0;
 int req_width = 0;
 int req_height = 0;
+//printf("container width: %d\n", (int)w->core.width);
 // calculate the minimum size requirements for all columns and rows
 // we need to run this 2 times: for widgets without colspan/rowspan first
 // and then again for colspan/rowspan > 1
 int span_max = 1;
 for(int r=0;r<2;r++) {
 for(int i=0;i<w->composite.num_children;i++) {
 Widget child = w->composite.children[i];
 GridConstraintRec *constraints = child->core.constraints;
+if(constraints->grid.pref_width == 0) {
+constraints->grid.pref_width = child->core.width;
+}
+if(constraints->grid.pref_height == 0) {
+constraints->grid.pref_height = child->core.height;
+}
+if(constraints->grid.pref_width < constraints->grid.min_width) {
+constraints->grid.pref_width = constraints->grid.min_width;
+}
 if(constraints->grid.colspan > span_max || constraints->grid.rowspan > span_max) {
 continue;
 }
 }
 }
 span_max = 50000; // not sure if this is unreasonable low or high
 }
+// calc required size
 for(int i=0;i<ncols;i++) {
 if(cols[i].expand) {
 num_cols_expanding++;
 }
 req_width += cols[i].size;
 }
 req_height += rows[i].size;
 }
 if(req_width > 0 && req_height > 0) {
+// add col/row spacing
+req_width += (ncols-1)*w->mywidget.columnspacing;
+req_height += (nrows-1)*w->mywidget.rowspacing;
 Widget parent = w->core.parent;
 Dimension rwidth = req_width;
 Dimension rheight = req_height;
 if(rwidth < w->core.width) {
 //rwidth = w->core.width;
 }
 if(!w->mywidget.sizerequest) {
 Dimension actual_width, actual_height;
 w->mywidget.sizerequest = TRUE;
+//XtWidgetGeometry request;
+//request.width = req_width;
+//request.request_mode = CWWidth;
+//XtWidgetGeometry reply;
+//XtGeometryResult result = XtMakeGeometryRequest((Widget)w, &request, &reply);
 XtMakeResizeRequest((Widget)w, req_width, req_height, &actual_width, &actual_height);
 w->mywidget.sizerequest = FALSE;
 //printf("size request: %d %d\n", (int)actual_width, (int)actual_height);
 }
 }
+// how much space can we add to each expanding col/row
 int hexpand = 0;
 int width_diff = (int)w->core.width - req_width;
 int hexpand2 = 0;
 if(width_diff > 0 && num_cols_expanding > 0) {
 hexpand = width_diff / num_cols_expanding;
 for(int i=0;i<ncols;i++) {
 cols[i].pos = x;
 if(cols[i].expand) {
 cols[i].size += hexpand + hexpand2;
 }
-x += cols[i].size;
+x += cols[i].size + w->mywidget.columnspacing;
 hexpand2 = 0;
 }
 int vexpand = 0;
 for(int i=0;i<nrows;i++) {
 rows[i].pos = y;
 if(rows[i].expand) {
 rows[i].size += vexpand + vexpand2;
 }
-y += rows[i].size;
+y += rows[i].size += w->mywidget.rowspacing;
 vexpand2 = 0;
 }
 for(int i=0;i<w->composite.num_children;i++) {
 if(constraints->grid.hfill) {
 if(constraints->grid.colspan > 1) {
 Dimension cwidth = 0;
 for(int j=0;j<constraints->grid.colspan;j++) {
 if(constraints->grid.x+j < ncols) {
-cwidth += cols[constraints->grid.x+j].size;
+cwidth += cols[constraints->grid.x+j].size + (j > 0 ? w->mywidget.columnspacing : 0);
 }
 }
 width = cwidth;
 } else {
-width = c.size;
+width = c.size - w->mywidget.columnspacing;
 }
 }
 if(constraints->grid.vfill) {
 if(constraints->grid.rowspan > 1) {
 Dimension cheight = 0;
 for(int j=0;j<constraints->grid.rowspan;j++) {
 if(constraints->grid.y+j < nrows) {
-cheight += rows[constraints->grid.y+j].size;
+cheight += rows[constraints->grid.y+j].size + (j > 0 ? w->mywidget.rowspacing : 0);
 }
 }
 height = cheight;
 } else {
-height = r.size;
+height = r.size - w->mywidget.rowspacing;
 }
 }
-XtConfigureWidget(child, x, y, width, height, child->core.border_width);
+if(width > 0 && height > 0) {
+XtConfigureWidget(child, x, y, width, height, child->core.border_width);
+}
 //printf("child %d %d - %d %d\n", (int)child->core.x, (int)child->core.y, (int)child->core.width, (int)child->core.height);
 }
 free(cols);
 free(rows);

Mercurial > hg > idav / file comparison

comparison: ui/motif/Grid.c

ui/motif/Grid.c