ui/cocoa/GridLayout.m

Tue, 07 Oct 2025 14:59:11 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Tue, 07 Oct 2025 14:59:11 +0200
changeset 810
7b5ba65b246f
parent 800
814d374fb689
child 811
1391ba7e533f
permissions
-rw-r--r--

fix alignment insets in the grid layout (Cocoa)

404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
4 * Copyright 2024 Olaf Wintermann. All rights reserved.
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #import "GridLayout.h"
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
31
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
33 @implementation GridLayout
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
34
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
35 @synthesize label=_label;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
36 @synthesize uilayout=_uilayout;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
37 @synthesize newline=_newline;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
38
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
39 - (GridLayout*)init {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
40 self = [super init];
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41 _columnspacing = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
42 _rowspacing = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
43 _children = cxArrayListCreateSimple(sizeof(GridElm), 32);
785
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
44 _preferredSize.width = -1;
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
45 _preferredSize.height = -1;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
46
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
47 return self;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
48 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
49
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
50 /*
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
51 - (void) layout {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
52 [super layout];
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
53
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
54 NSRect r1 = _test.frame;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
55 NSSize s1 = _test.intrinsicContentSize;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
56 NSEdgeInsets e1 = _test.alignmentRectInsets;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
57
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
58 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
59 */
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
60
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
61 - (BOOL)isFlipped {
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
62 return YES;
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
63 }
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
64
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
65 - (void) layout {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
66 int ncols = _cols+1;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
67 int nrows = _rows+1;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
68
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
69 GridDef *cols = calloc(ncols, sizeof(GridDef));
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
70 GridDef *rows = calloc(nrows, sizeof(GridDef));
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
71
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
72 //NSRect viewFrame = self.frame;
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
73 NSRect viewFrame = self.bounds;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
74
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
75 int colspacing = _columnspacing;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
76 int rowspacing = _rowspacing;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
77
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
78 int span_max = 1;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
79 for(int r=0;r<2;r++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
80 CxIterator i = cxListIterator(_children);
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
81 cx_foreach(GridElm *, elm, i) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
82 int x = elm->x;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
83 int y = elm->y;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
84 GridDef *col = &cols[x];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
85 GridDef *row = &rows[y];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
86
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
87 if(elm->margin.left + elm->margin.right > 0) {
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
88 printf(""); // break
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
89 }
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
90
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
91 NSSize size = elm->view.intrinsicContentSize;
538
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
92 NSSize size2 = elm->view.fittingSize;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
93 if(size.width == NSViewNoIntrinsicMetric) {
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
94 size.width = size2.width;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
95 }
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
96 if(size.height == NSViewNoIntrinsicMetric) {
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
97 size.height = size2.height;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
98 }
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
99 if(size.width != NSViewNoIntrinsicMetric) {
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
100 CGFloat width = size.width + elm->margin.left + elm->margin.right;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
101 if(width > cols[elm->x].preferred_size && elm->colspan <= 1 && span_max == 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
102 cols[elm->x].preferred_size = width;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
103 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
104 elm->preferred_width = width;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
105 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
106 if(size.height != NSViewNoIntrinsicMetric) {
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
107 CGFloat height = size.height + elm->margin.top + elm->margin.bottom;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
108 if(height > rows[elm->y].preferred_size && elm->rowspan <= 1 && span_max == 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
109 rows[elm->y].preferred_size = height;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
110 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
111 elm->preferred_height = height;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
112 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
113
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
114
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
115 if(elm->rowspan > span_max || elm->colspan > span_max) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
116 continue;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
117 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
118
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
119 int end_col = x+elm->colspan;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
120 if(end_col > ncols) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
121 end_col = ncols;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
122 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
123 int end_row = y+elm->rowspan;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
124 if(end_row > nrows) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
125 end_row = nrows;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
126 }
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
127
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
128 // are all columns in the span > preferred_width?
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
129 if(elm->colspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
130 int span_width = 0;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
131 GridDef *last_col = col;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
132 for(int c=x;c<end_col;c++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
133 span_width += cols[c].size;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
134 last_col = &cols[c];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
135 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
136 if(span_width < elm->preferred_width) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
137 last_col->size += elm->preferred_width - span_width;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
138 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
139 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
140 // are all rows in the span > preferred_height?
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
141 if(elm->rowspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
142 int span_height = 0;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
143 GridDef *last_row = row;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
144 for(int c=x;c<end_row;c++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
145 span_height += rows[c].size;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
146 last_row = &rows[c];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
147 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
148 if(span_height < elm->preferred_height) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
149 last_row->size += elm->preferred_height - span_height;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
150 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
151 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
152
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
153 if(elm->hexpand) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
154 if(elm->colspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
155 // check if any column in the span is expanding
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
156 // if not, make the last column expanding
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
157 GridDef *last_col = col;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
158 for(int c=x;c<end_col;c++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
159 last_col = &cols[c];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
160 if(last_col->expand) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
161 break;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
162 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
163 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
164 last_col->expand = TRUE;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
165 } else {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
166 col->expand = TRUE;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
167 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
168 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
169 if(elm->vexpand) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
170 if(elm->rowspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
171 // same as colspan
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
172 GridDef *last_row = row;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
173 for(int c=x;c<nrows;c++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
174 last_row = &rows[c];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
175 if(last_row->expand) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
176 break;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
177 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
178 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
179 last_row->expand = TRUE;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
180 } else {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
181 row->expand = TRUE;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
182 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
183 }
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
184 }
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
185 span_max = 50000; // not sure if this is unreasonable low or high
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
186 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
187
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
188
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
189 int col_ext = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
190 int row_ext = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
191
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
192 int preferred_width = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
193 int preferred_height = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
194 for(int j=0;j<ncols;j++) {
799
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
195 preferred_width += cols[j].preferred_size;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
196 if(cols[j].expand) {
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
197 col_ext++;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
198 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
199 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
200 for(int j=0;j<nrows;j++) {
799
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
201 preferred_height += rows[j].preferred_size;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
202 if(rows[j].expand) {
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
203 row_ext++;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
204 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
205 }
799
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
206 if(ncols > 0) {
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
207 preferred_width += (ncols-1) * colspacing;
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
208 }
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
209 if(nrows > 0) {
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
210 preferred_height += (nrows-1) * rowspacing;
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
211 }
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
212
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
213 _preferredSize.width = preferred_width;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
214 _preferredSize.height = preferred_height;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
215
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
216
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
217 int hremaining = viewFrame.size.width - preferred_width;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
218 int vremaining = viewFrame.size.height - preferred_height;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
219 int hext = hremaining/col_ext;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
220 int vext = vremaining/row_ext;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
221
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
222 for(int j=0;j<ncols;j++) {
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
223 GridDef *col = &cols[j];
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
224 if(col->expand) {
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
225 col->size = col->preferred_size + hext;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
226 } else {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
227 col->size = col->preferred_size;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
228 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
229 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
230 for(int j=0;j<nrows;j++) {
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
231 GridDef *row = &rows[j];
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
232 if(row->expand) {
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
233 row->size = row->preferred_size + vext;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
234 } else {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
235 row->size = row->preferred_size;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
236 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
237 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
238
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
239 int pos = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
240 for(int j=0;j<ncols;j++) {
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
241 cols[j].pos = pos;
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
242 pos += cols[j].size + colspacing;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
243 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
244 pos = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
245 for(int j=0;j<nrows;j++) {
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
246 rows[j].pos = pos;
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
247 pos += rows[j].size + rowspacing;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
248 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
249
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
250 CxIterator i = cxListIterator(_children);
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
251 cx_foreach(GridElm *, elm, i) {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
252 //NSSize size = elm->view.intrinsicContentSize;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
253 GridDef *col = &cols[elm->x];
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
254 GridDef *row = &rows[elm->y];
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
255
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
256 NSRect frame;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
257 if(elm->hfill) {
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
258 if(elm->colspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
259 int cwidth = 0;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
260 int end_col = elm->x + elm->colspan;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
261 if(end_col > ncols) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
262 end_col = ncols;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
263 }
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
264 int real_span = 0;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
265 for(int c=elm->x;c<end_col;c++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
266 cwidth += cols[c].size;
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
267 real_span++;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
268 }
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
269 if(real_span > 0) {
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
270 cwidth += (real_span-1) * colspacing;
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
271 }
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
272 frame.size.width = cwidth;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
273 } else {
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
274 frame.size.width = col->size;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
275 }
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
276 } else {
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
277 frame.size.width = elm->preferred_width;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
278 }
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
279 frame.size.width -= elm->margin.left + elm->margin.right;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
280 if(elm->vfill) {
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
281 if(elm->rowspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
282 int rheight = 0;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
283 int end_row = elm->y + elm->rowspan;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
284 if(end_row > nrows) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
285 end_row = nrows;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
286 }
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
287 int real_span = 0;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
288 for(int r=elm->y;r<end_row;r++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
289 rheight += rows[r].size;
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
290 real_span++;
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
291 }
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
292 if(real_span > 0) {
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
293 rheight += (real_span-1) * rowspacing;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
294 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
295 frame.size.height = rheight;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
296 }
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
297 frame.size.height = row->size;
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
298 } else {
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
299 frame.size.height = elm->preferred_height;
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
300 }
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
301
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
302 frame.origin.x = col->pos + elm->margin.left;
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
303 frame.origin.y = row->pos + elm->margin.top;
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
304 NSRect viewFrame = [elm->view frameForAlignmentRect:frame];
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
305 elm->view.frame = viewFrame;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
306 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
307
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
308 free(cols);
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
309 free(rows);
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
310 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
311
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
312
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
313 - (NSSize)intrinsicContentSize {
785
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
314 if(_preferredSize.width == -1) {
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
315 [self layout];
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
316 }
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
317 return self.preferredSize;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
318 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
319
799
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
320 - (void) addView:(NSView*)view margin:(NSEdgeInsets)margin {
785
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
321 _preferredSize.width = -1;
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
322 _preferredSize.height = -1;
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
323
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
324 if(_newline) {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
325 _y++;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
326 _x = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
327 _newline = FALSE;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
328 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
329
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
330 GridElm elm;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
331 elm.x = _x;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
332 elm.y = _y;
799
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
333 elm.margin = margin;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
334 elm.colspan = _uilayout.colspan;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
335 elm.rowspan = _uilayout.rowspan;
538
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
336 if(_uilayout.fill) {
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
337 elm.hfill = TRUE;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
338 elm.vfill = TRUE;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
339 elm.hexpand = TRUE;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
340 elm.vexpand = TRUE;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
341 } else {
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
342 elm.hfill = _uilayout.hfill;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
343 elm.vfill = _uilayout.vfill;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
344 elm.hexpand = _uilayout.hexpand;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
345 elm.vexpand = _uilayout.vexpand;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
346 }
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
347 elm.view = view;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
348 cxListAdd(_children, &elm);
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
349
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
350 [self addSubview:view];
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
351 self.needsLayout = YES;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
352
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
353 if(_x > _cols) {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
354 _cols = _x;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
355 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
356 if(_y > _rows) {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
357 _rows = _y;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
358 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
359 _x++;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
360 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
361
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
362 - (void) dealloc {
447
7618acaaf684 fix build (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 404
diff changeset
363 cxListFree(_children);
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
364 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
365
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
366 @end

mercurial