ui/cocoa/GridLayout.m

Fri, 10 Oct 2025 14:13:52 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Fri, 10 Oct 2025 14:13:52 +0200
changeset 828
a952337ae325
parent 811
1391ba7e533f
child 846
ffa983c223c1
permissions
-rw-r--r--

add sourcelist data source (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 uilayout=_uilayout;
811
1391ba7e533f implement splitview window (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 810
diff changeset
36 @synthesize container=_container;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
37
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
38 - (GridLayout*)init {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
39 self = [super init];
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
40 _columnspacing = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41 _rowspacing = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
42 _children = cxArrayListCreateSimple(sizeof(GridElm), 32);
785
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
43 _preferredSize.width = -1;
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
44 _preferredSize.height = -1;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
45
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
46 return self;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
47 }
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 - (void) layout {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
51 [super layout];
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
52
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
53 NSRect r1 = _test.frame;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
54 NSSize s1 = _test.intrinsicContentSize;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
55 NSEdgeInsets e1 = _test.alignmentRectInsets;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
56
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
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
60 - (BOOL)isFlipped {
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
61 return YES;
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
62 }
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
63
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
64 - (void) layout {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
65 int ncols = _cols+1;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
66 int nrows = _rows+1;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
67
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
68 GridDef *cols = calloc(ncols, sizeof(GridDef));
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
69 GridDef *rows = calloc(nrows, sizeof(GridDef));
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
70
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
71 //NSRect viewFrame = self.frame;
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
72 NSRect viewFrame = self.bounds;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
73
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
74 int colspacing = _columnspacing;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
75 int rowspacing = _rowspacing;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
76
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
77 int span_max = 1;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
78 for(int r=0;r<2;r++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
79 CxIterator i = cxListIterator(_children);
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
80 cx_foreach(GridElm *, elm, i) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
81 int x = elm->x;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
82 int y = elm->y;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
83 GridDef *col = &cols[x];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
84 GridDef *row = &rows[y];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
85
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
86 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
87 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
88 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
89 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
90 }
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
91 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
92 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
93 }
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
94 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
95 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
96 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
97 cols[elm->x].preferred_size = width;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
98 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
99 elm->preferred_width = width;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
100 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
101 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
102 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
103 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
104 rows[elm->y].preferred_size = height;
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 elm->preferred_height = height;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
107 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
108
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
109
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
110 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
111 continue;
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
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
114 int end_col = x+elm->colspan;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
115 if(end_col > ncols) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
116 end_col = ncols;
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 int end_row = y+elm->rowspan;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
119 if(end_row > nrows) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
120 end_row = nrows;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
121 }
449
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 // are all columns in the span > preferred_width?
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
124 if(elm->colspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
125 int span_width = 0;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
126 GridDef *last_col = col;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
127 for(int c=x;c<end_col;c++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
128 span_width += cols[c].size;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
129 last_col = &cols[c];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
130 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
131 if(span_width < elm->preferred_width) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
132 last_col->size += elm->preferred_width - span_width;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
133 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
134 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
135 // are all rows in the span > preferred_height?
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
136 if(elm->rowspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
137 int span_height = 0;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
138 GridDef *last_row = row;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
139 for(int c=x;c<end_row;c++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
140 span_height += rows[c].size;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
141 last_row = &rows[c];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
142 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
143 if(span_height < elm->preferred_height) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
144 last_row->size += elm->preferred_height - span_height;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
145 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
146 }
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(elm->hexpand) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
149 if(elm->colspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
150 // 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
151 // if not, make the last column expanding
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
152 GridDef *last_col = col;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
153 for(int c=x;c<end_col;c++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
154 last_col = &cols[c];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
155 if(last_col->expand) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
156 break;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
157 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
158 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
159 last_col->expand = TRUE;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
160 } else {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
161 col->expand = TRUE;
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 if(elm->vexpand) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
165 if(elm->rowspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
166 // same as colspan
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
167 GridDef *last_row = row;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
168 for(int c=x;c<nrows;c++) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
169 last_row = &rows[c];
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
170 if(last_row->expand) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
171 break;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
172 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
173 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
174 last_row->expand = TRUE;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
175 } else {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
176 row->expand = TRUE;
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 }
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
179 }
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
180 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
181 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
182
449
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 int col_ext = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
185 int row_ext = 0;
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 int preferred_width = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
188 int preferred_height = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
189 for(int j=0;j<ncols;j++) {
799
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
190 preferred_width += cols[j].preferred_size;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
191 if(cols[j].expand) {
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
192 col_ext++;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
193 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
194 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
195 for(int j=0;j<nrows;j++) {
799
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
196 preferred_height += rows[j].preferred_size;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
197 if(rows[j].expand) {
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
198 row_ext++;
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 }
799
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
201 if(ncols > 0) {
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
202 preferred_width += (ncols-1) * colspacing;
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
203 }
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
204 if(nrows > 0) {
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
205 preferred_height += (nrows-1) * rowspacing;
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
206 }
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
207
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
208 _preferredSize.width = preferred_width;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
209 _preferredSize.height = preferred_height;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
210
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
211
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
212 int hremaining = viewFrame.size.width - preferred_width;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
213 int vremaining = viewFrame.size.height - preferred_height;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
214 int hext = hremaining/col_ext;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
215 int vext = vremaining/row_ext;
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 for(int j=0;j<ncols;j++) {
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
218 GridDef *col = &cols[j];
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
219 if(col->expand) {
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
220 col->size = col->preferred_size + hext;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
221 } else {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
222 col->size = col->preferred_size;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
223 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
224 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
225 for(int j=0;j<nrows;j++) {
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
226 GridDef *row = &rows[j];
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
227 if(row->expand) {
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
228 row->size = row->preferred_size + vext;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
229 } else {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
230 row->size = row->preferred_size;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
231 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
232 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
233
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
234 int pos = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
235 for(int j=0;j<ncols;j++) {
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
236 cols[j].pos = pos;
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
237 pos += cols[j].size + colspacing;
404
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 pos = 0;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
240 for(int j=0;j<nrows;j++) {
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
241 rows[j].pos = pos;
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
242 pos += rows[j].size + rowspacing;
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
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
245 CxIterator i = cxListIterator(_children);
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
246 cx_foreach(GridElm *, elm, i) {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
247 //NSSize size = elm->view.intrinsicContentSize;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
248 GridDef *col = &cols[elm->x];
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
249 GridDef *row = &rows[elm->y];
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
250
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
251 NSRect frame;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
252 if(elm->hfill) {
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
253 if(elm->colspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
254 int cwidth = 0;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
255 int end_col = elm->x + elm->colspan;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
256 if(end_col > ncols) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
257 end_col = ncols;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
258 }
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
259 int real_span = 0;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
260 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
261 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
262 real_span++;
449
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 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
265 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
266 }
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
267 frame.size.width = cwidth;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
268 } else {
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
269 frame.size.width = col->size;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
270 }
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
271 } else {
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
272 frame.size.width = elm->preferred_width;
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
273 }
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
274 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
275 if(elm->vfill) {
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
276 if(elm->rowspan > 1) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
277 int rheight = 0;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
278 int end_row = elm->y + elm->rowspan;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
279 if(end_row > nrows) {
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
280 end_row = nrows;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
281 }
800
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
282 int real_span = 0;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
283 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
284 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
285 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
286 }
814d374fb689 add new margin widget args and implement margin in the cocoa gridlayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 799
diff changeset
287 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
288 rheight += (real_span-1) * rowspacing;
449
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
289 }
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
290 frame.size.height = rheight;
7681d538deaf implement grid colspan/rowspan (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 448
diff changeset
291 }
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
292 frame.size.height = row->size;
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
293 } else {
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
294 frame.size.height = elm->preferred_height;
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
295 }
810
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
296
7b5ba65b246f fix alignment insets in the grid layout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 800
diff changeset
297 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
298 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
299 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
300 elm->view.frame = viewFrame;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
301 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
302
448
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
303 free(cols);
629ac70913aa implement grid hfill/vfill (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 447
diff changeset
304 free(rows);
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
305 }
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
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
308 - (NSSize)intrinsicContentSize {
785
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
309 if(_preferredSize.width == -1) {
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
310 [self layout];
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
311 }
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
312 return self.preferredSize;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
313 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
314
799
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
315 - (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
316 _preferredSize.width = -1;
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
317 _preferredSize.height = -1;
b943e3d618f0 create new BoxContainer based on GridLayout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 718
diff changeset
318
811
1391ba7e533f implement splitview window (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 810
diff changeset
319 if(self.container->newline) {
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
320 _y++;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
321 _x = 0;
811
1391ba7e533f implement splitview window (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 810
diff changeset
322 self.container->newline = FALSE;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
323 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
324
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
325 GridElm elm;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
326 elm.x = _x;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
327 elm.y = _y;
799
f8ff8df41713 fix grid spacing (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 785
diff changeset
328 elm.margin = margin;
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
329 elm.colspan = _uilayout.colspan;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
330 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
331 if(_uilayout.fill) {
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
332 elm.hfill = TRUE;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
333 elm.vfill = TRUE;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
334 elm.hexpand = TRUE;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
335 elm.vexpand = TRUE;
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
336 } else {
5004b4a9b16d use view.fittingSize as backup to intrisicContentSize in GridLayout (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
337 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
338 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
339 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
340 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
341 }
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
342 elm.view = view;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
343 cxListAdd(_children, &elm);
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
344
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
345 [self addSubview:view];
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
346 self.needsLayout = YES;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
347
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
348 if(_x > _cols) {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
349 _cols = _x;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
350 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
351 if(_y > _rows) {
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
352 _rows = _y;
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
353 }
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
354 _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
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
357 - (void) dealloc {
447
7618acaaf684 fix build (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 404
diff changeset
358 cxListFree(_children);
404
384f6d1f5784 add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
359 }
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 @end

mercurial