ui/gtk/container.c

Sun, 31 Aug 2025 07:48:07 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 31 Aug 2025 07:48:07 +0200
changeset 743
85588901880f
parent 732
3920f803ef19
child 765
ee08f7859b78
permissions
-rw-r--r--

avoid using deprecated GtkAlignment

4
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
140
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 121
diff changeset
4 * Copyright 2017 Olaf Wintermann. All rights reserved.
4
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
39b9b86ec452 added simple container
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
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdlib.h>
165
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
31 #include <limits.h>
4
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
33 #include "container.h"
165
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
34 #include "toolkit.h"
336
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
35 #include "headerbar.h"
165
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
36
4
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
37 #include "../common/context.h"
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
38 #include "../common/object.h"
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
39
166
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
40
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
41 void ui_container_begin_close(UiObject *obj) {
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
42 UiContainer *ct = uic_get_current_container(obj);
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
43 ct->close = 1;
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
44 }
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
45
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
46 int ui_container_finish(UiObject *obj) {
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
47 UiContainer *ct = uic_get_current_container(obj);
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
48 if(ct->close) {
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
49 ui_end(obj);
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
50 return 0;
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
51 }
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
52 return 1;
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
53 }
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
54
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
55 GtkWidget* ui_gtk_vbox_new(int spacing) {
297
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
56 #if GTK_MAJOR_VERSION >= 3
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
57 return gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing);
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
58 #else
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
59 return gtk_vbox_new(FALSE, spacing);
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
60 #endif
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
61 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
62
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
63 GtkWidget* ui_gtk_hbox_new(int spacing) {
297
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
64 #if GTK_MAJOR_VERSION >= 3
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
65 return gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing);
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
66 #else
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
67 return gtk_hbox_new(FALSE, spacing);
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
68 #endif
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
69 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
70
353
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
71 GtkWidget* ui_subcontainer_create(
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
72 UiSubContainerType type,
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
73 UiObject *newobj,
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
74 int spacing,
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
75 int columnspacing,
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
76 int rowspacing,
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
77 int margin)
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
78 {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
79 GtkWidget *sub = NULL;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
80 GtkWidget *add = NULL;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
81 switch(type) {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
82 default: {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
83 sub = ui_gtk_vbox_new(spacing);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
84 add = ui_box_set_margin(sub, margin);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
85 newobj->container = ui_box_container(newobj, sub, type);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
86 newobj->widget = sub;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
87 break;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
88 }
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
89 case UI_CONTAINER_HBOX: {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
90 sub = ui_gtk_hbox_new(spacing);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
91 add = ui_box_set_margin(sub, margin);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
92 newobj->container = ui_box_container(newobj, sub, type);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
93 newobj->widget = sub;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
94 break;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
95 }
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
96 case UI_CONTAINER_GRID: {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
97 sub = ui_create_grid_widget(columnspacing, rowspacing);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
98 add = ui_box_set_margin(sub, margin);
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
99 newobj->container = ui_grid_container(newobj, sub, FALSE, FALSE, FALSE, FALSE);
353
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
100 newobj->widget = sub;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
101 break;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
102 }
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
103 case UI_CONTAINER_NO_SUB: {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
104 break;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
105 }
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
106 }
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
107 return add;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
108 }
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
109
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
110
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
111 /* -------------------- Box Container -------------------- */
297
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
112 UiContainer* ui_box_container(UiObject *obj, GtkWidget *box, UiSubContainerType type) {
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
113 UiBoxContainer *ct = cxCalloc(
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
114 obj->ctx->allocator,
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
115 1,
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
116 sizeof(UiBoxContainer));
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
117 ct->container.widget = box;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
118 ct->container.add = ui_box_container_add;
297
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
119 ct->type = type;
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
120 return (UiContainer*)ct;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
121 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
122
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
123 void ui_box_container_add(UiContainer *ct, GtkWidget *widget) {
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
124 UiBoxContainer *bc = (UiBoxContainer*)ct;
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
125 UiBool fill = ct->layout.fill;
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
126 if(bc->has_fill && fill) {
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
127 fprintf(stderr, "UiError: container has 2 filled widgets");
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
128 fill = FALSE;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
129 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
130 if(fill) {
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
131 bc->has_fill = TRUE;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
132 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
133
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
134 UiBool expand = fill;
297
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
135 #if GTK_MAJOR_VERSION >= 4
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
136 gtk_box_append(GTK_BOX(ct->widget), widget);
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
137 GtkAlign align = expand ? GTK_ALIGN_FILL : GTK_ALIGN_START;
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
138 if(bc->type == UI_CONTAINER_VBOX) {
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
139 gtk_widget_set_valign(widget, align);
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
140 gtk_widget_set_vexpand(widget, expand);
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
141 gtk_widget_set_hexpand(widget, TRUE);
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
142 } else if(bc->type == UI_CONTAINER_HBOX) {
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
143 gtk_widget_set_halign(widget, align);
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
144 gtk_widget_set_hexpand(widget, expand);
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
145 gtk_widget_set_vexpand(widget, TRUE);
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
146 }
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
147
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
148 #else
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
149 gtk_box_pack_start(GTK_BOX(ct->widget), widget, expand, fill, 0);
297
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
150 #endif
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
151
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
152 ui_reset_layout(ct->layout);
75
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
153 ct->current = widget;
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
154 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
155
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
156 UiContainer* ui_grid_container(
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
157 UiObject *obj,
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
158 GtkWidget *grid,
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
159 UiBool def_hexpand,
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
160 UiBool def_vexpand,
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
161 UiBool def_hfill,
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
162 UiBool def_vfill)
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
163 {
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
164 UiGridContainer *ct = cxCalloc(
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
165 obj->ctx->allocator,
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
166 1,
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
167 sizeof(UiGridContainer));
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
168 ct->def_hexpand = def_hexpand;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
169 ct->def_vexpand = def_vexpand;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
170 ct->def_hfill = def_hfill;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
171 ct->def_vfill = def_vfill;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
172 ct->container.widget = grid;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
173 ct->container.add = ui_grid_container_add;
305
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
174 UI_GTK_V2(ct->width = 0);
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
175 UI_GTK_V2(ct->height = 1);
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
176 return (UiContainer*)ct;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
177 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
178
297
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
179 #if GTK_MAJOR_VERSION >= 3
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
180 void ui_grid_container_add(UiContainer *ct, GtkWidget *widget) {
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
181 UiGridContainer *grid = (UiGridContainer*)ct;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
182
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
183 if(ct->layout.newline) {
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
184 grid->x = 0;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
185 grid->y++;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
186 ct->layout.newline = FALSE;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
187 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
188
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
189 int hexpand = FALSE;
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
190 int vexpand = FALSE;
378
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
191 int hfill = FALSE;
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
192 int vfill = FALSE;
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
193 if(!ct->layout.override_defaults) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
194 if(grid->def_hexpand) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
195 hexpand = TRUE;
731
8487d11b9491 h/v expand/fill should be independent setting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
196 }
8487d11b9491 h/v expand/fill should be independent setting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
197 if(grid->def_hfill) {
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
198 hfill = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
199 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
200 if(grid->def_vexpand) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
201 vexpand = TRUE;
731
8487d11b9491 h/v expand/fill should be independent setting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
202 }
8487d11b9491 h/v expand/fill should be independent setting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
203 if(grid->def_vfill) {
732
3920f803ef19 fix inconsistent fill/expand settings (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 731
diff changeset
204 vfill = TRUE;
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
205 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
206 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
207
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
208 UiBool fill = ct->layout.fill;
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
209 if(ct->layout.hexpand) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
210 hexpand = TRUE;
732
3920f803ef19 fix inconsistent fill/expand settings (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 731
diff changeset
211 }
3920f803ef19 fix inconsistent fill/expand settings (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 731
diff changeset
212 if(ct->layout.hfill) {
378
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
213 hfill = TRUE;
94
d51e334c1439 added checkbox and labels with alignment (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
214 }
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
215 if(ct->layout.vexpand) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
216 vexpand = TRUE;
732
3920f803ef19 fix inconsistent fill/expand settings (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 731
diff changeset
217 }
3920f803ef19 fix inconsistent fill/expand settings (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 731
diff changeset
218 if(ct->layout.vfill) {
378
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
219 vfill = TRUE;
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
220 }
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
221 if(fill) {
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
222 hfill = TRUE;
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
223 vfill = TRUE;
732
3920f803ef19 fix inconsistent fill/expand settings (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 731
diff changeset
224 hexpand = TRUE;
3920f803ef19 fix inconsistent fill/expand settings (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 731
diff changeset
225 vexpand = TRUE;
378
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
226 }
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
227
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
228 if(!hfill) {
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
229 gtk_widget_set_halign(widget, GTK_ALIGN_START);
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
230 }
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
231 if(!vfill) {
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
232 gtk_widget_set_valign(widget, GTK_ALIGN_START);
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
233 }
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
234
303
dc8b504604f4 fix gtk3/4 grid hexpand/vexpand setting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
235 gtk_widget_set_hexpand(widget, hexpand);
dc8b504604f4 fix gtk3/4 grid hexpand/vexpand setting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
236 gtk_widget_set_vexpand(widget, vexpand);
94
d51e334c1439 added checkbox and labels with alignment (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
237
260
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
238 int colspan = ct->layout.colspan > 0 ? ct->layout.colspan : 1;
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
239 int rowspan = ct->layout.rowspan > 0 ? ct->layout.rowspan : 1;
109
b9808f916687 added gridwidth layout option (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
240
260
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
241 gtk_grid_attach(GTK_GRID(ct->widget), widget, grid->x, grid->y, colspan, rowspan);
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
242 grid->x += colspan;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
243
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
244 ui_reset_layout(ct->layout);
75
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
245 ct->current = widget;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
246 }
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
247 #endif
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
248 #ifdef UI_GTK2
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
249 void ui_grid_container_add(UiContainer *ct, GtkWidget *widget) {
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
250 UiGridContainer *grid = (UiGridContainer*)ct;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
251
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
252 if(ct->layout.newline) {
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
253 grid->x = 0;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
254 grid->y++;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
255 ct->layout.newline = FALSE;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
256 }
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
257
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
258 int hexpand = FALSE;
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
259 int vexpand = FALSE;
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
260 int hfill = FALSE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
261 int vfill = FALSE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
262 if(!ct->layout.override_defaults) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
263 if(grid->def_hexpand) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
264 hexpand = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
265 hfill = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
266 } else if(grid->def_hfill) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
267 hfill = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
268 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
269 if(grid->def_vexpand) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
270 vexpand = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
271 vfill = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
272 } else if(grid->def_vfill) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
273 vfill = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
274 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
275 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
276
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
277 UiBool fill = ct->layout.fill;
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
278 if(ct->layout.hexpand) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
279 hexpand = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
280 hfill = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
281 } else if(ct->layout.hfill) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
282 hfill = TRUE;
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
283 }
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
284 if(ct->layout.vexpand) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
285 vexpand = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
286 vfill = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
287 } else if(ct->layout.vfill) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
288 vfill = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
289 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
290 if(fill) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
291 hfill = TRUE;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
292 vfill = TRUE;
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
293 }
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
294
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
295 GtkAttachOptions xoptions = 0;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
296 GtkAttachOptions yoptions = 0;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
297 if(hexpand) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
298 xoptions = GTK_EXPAND;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
299 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
300 if(hfill) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
301 xoptions |= GTK_FILL;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
302 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
303 if(vexpand) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
304 yoptions = GTK_EXPAND;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
305 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
306 if(vfill) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
307 yoptions |= GTK_FILL;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
308 }
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
309
260
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
310 int colspan = ct->layout.colspan > 0 ? ct->layout.colspan : 1;
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
311 int rowspan = ct->layout.rowspan > 0 ? ct->layout.rowspan : 1;
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
312 // TODO: use colspan/rowspan
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
313
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
314 gtk_table_attach(GTK_TABLE(ct->widget), widget, grid->x, grid->x+1, grid->y, grid->y+1, xoptions, yoptions, 0, 0);
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
315 grid->x++;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
316 int nw = grid->x > grid->width ? grid->x : grid->width;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
317 if(grid->x > grid->width || grid->y > grid->height) {
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
318 grid->width = nw;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
319 grid->height = grid->y + 1;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
320 gtk_table_resize(GTK_TABLE(ct->widget), grid->width, grid->height);
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
321 }
75
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
322
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
323 ui_reset_layout(ct->layout);
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
324 ct->current = widget;
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
325 }
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
326 #endif
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
327
353
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
328 UiContainer* ui_frame_container(UiObject *obj, GtkWidget *frame) {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
329 UiContainer *ct = cxCalloc(
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
330 obj->ctx->allocator,
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
331 1,
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
332 sizeof(UiContainer));
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
333 ct->widget = frame;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
334 ct->add = ui_frame_container_add;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
335 return ct;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
336 }
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
337
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
338 void ui_frame_container_add(UiContainer *ct, GtkWidget *widget) {
353
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
339 FRAME_SET_CHILD(ct->widget, widget);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
340 }
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
341
354
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
342 UiContainer* ui_expander_container(UiObject *obj, GtkWidget *expander) {
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
343 UiContainer *ct = cxCalloc(
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
344 obj->ctx->allocator,
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
345 1,
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
346 sizeof(UiContainer));
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
347 ct->widget = expander;
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
348 ct->add = ui_expander_container_add;
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
349 return ct;
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
350 }
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
351
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
352 void ui_expander_container_add(UiContainer *ct, GtkWidget *widget) {
354
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
353 EXPANDER_SET_CHILD(ct->widget, widget);
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
354 }
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
355
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
356 void ui_scrolledwindow_container_add(UiContainer *ct, GtkWidget *widget) {
354
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
357 // TODO: check if the widget implements GtkScrollable
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
358 SCROLLEDWINDOW_SET_CHILD(ct->widget, widget);
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
359 ui_reset_layout(ct->layout);
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
360 ct->current = widget;
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
361 }
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
362
120
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
363 UiContainer* ui_scrolledwindow_container(UiObject *obj, GtkWidget *scrolledwindow) {
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
364 UiContainer *ct = cxCalloc(
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
365 obj->ctx->allocator,
120
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
366 1,
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
367 sizeof(UiContainer));
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
368 ct->widget = scrolledwindow;
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
369 ct->add = ui_scrolledwindow_container_add;
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
370 return ct;
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
371 }
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
372
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
373 UiContainer* ui_tabview_container(UiObject *obj, GtkWidget *tabview) {
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
374 UiTabViewContainer *ct = cxCalloc(
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
375 obj->ctx->allocator,
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
376 1,
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
377 sizeof(UiTabViewContainer));
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
378 ct->container.widget = tabview;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
379 ct->container.add = ui_tabview_container_add;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
380 return (UiContainer*)ct;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
381 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
382
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
383 void ui_tabview_container_add(UiContainer *ct, GtkWidget *widget) {
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
384 UiGtkTabView *data = ui_widget_get_tabview_data(ct->widget);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
385 if(!data) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
386 fprintf(stderr, "UI Error: widget is not a tabview");
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
387 return;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
388 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
389 data->add_tab(ct->widget, -1, ct->layout.label, widget);
75
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
390
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
391 ui_reset_layout(ct->layout);
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
392 ct->current = widget;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
393 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
394
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
395
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
396
344
870dd3d41d83 add dialog window (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 336
diff changeset
397 GtkWidget* ui_box_set_margin(GtkWidget *box, int margin) {
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
398 GtkWidget *ret = box;
304
d554b2a60105 fix gtk box margin
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 303
diff changeset
399 #if GTK_MAJOR_VERSION >= 3
d554b2a60105 fix gtk box margin
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 303
diff changeset
400 #if GTK_MAJOR_VERSION * 1000 + GTK_MINOR_VERSION >= 3012
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
401 gtk_widget_set_margin_start(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
402 gtk_widget_set_margin_end(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
403 #else
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
404 gtk_widget_set_margin_left(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
405 gtk_widget_set_margin_right(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
406 #endif
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
407 gtk_widget_set_margin_top(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
408 gtk_widget_set_margin_bottom(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
409 #elif defined(UI_GTK2)
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
410 GtkWidget *a = gtk_alignment_new(0.5, 0.5, 1, 1);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
411 gtk_alignment_set_padding(GTK_ALIGNMENT(a), margin, margin, margin, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
412 gtk_container_add(GTK_CONTAINER(a), box);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
413 ret = a;
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
414 #endif
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
415 return ret;
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
416 }
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
417
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
418 UIWIDGET ui_box_create(UiObject *obj, UiContainerArgs *args, UiSubContainerType type) {
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
419 UiObject *current = uic_current_obj(obj);
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
420 UiContainer *ct = current->container;
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
421 UI_APPLY_LAYOUT2(current, args);
62
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
422
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
423 GtkWidget *box = type == UI_CONTAINER_VBOX ? ui_gtk_vbox_new(args->spacing) : ui_gtk_hbox_new(args->spacing);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
424 ui_set_name_and_style(box, args->name, args->style_class);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
425 GtkWidget *widget = args->margin > 0 ? ui_box_set_margin(box, args->margin) : box;
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
426 ct->add(ct, widget);
62
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
427
273
1dd2456c51d3 fix hbox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 271
diff changeset
428 UiObject *newobj = uic_object_new(obj, box);
297
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
429 newobj->container = ui_box_container(obj, box, type);
62
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
430 uic_obj_add(obj, newobj);
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
431
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
432 return widget;
62
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
433 }
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
434
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
435 UIEXPORT UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs *args) {
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
436 return ui_box_create(obj, args, UI_CONTAINER_VBOX);
62
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
437 }
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
438
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
439 UIEXPORT UIWIDGET ui_hbox_create(UiObject *obj, UiContainerArgs *args) {
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
440 return ui_box_create(obj, args, UI_CONTAINER_HBOX);
94
d51e334c1439 added checkbox and labels with alignment (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
441 }
d51e334c1439 added checkbox and labels with alignment (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
442
344
870dd3d41d83 add dialog window (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 336
diff changeset
443 GtkWidget* ui_create_grid_widget(int colspacing, int rowspacing) {
305
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
444 #if GTK_MAJOR_VERSION >= 3
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
445 GtkWidget *grid = gtk_grid_new();
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
446 gtk_grid_set_column_spacing(GTK_GRID(grid), colspacing);
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
447 gtk_grid_set_row_spacing(GTK_GRID(grid), rowspacing);
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
448 #else
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
449 GtkWidget *grid = gtk_table_new(1, 1, FALSE);
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
450 gtk_table_set_col_spacings(GTK_TABLE(grid), colspacing);
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
451 gtk_table_set_row_spacings(GTK_TABLE(grid), rowspacing);
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
452 #endif
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
453 return grid;
98470af75dcf simplfy macro usage in container.c (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
454 }
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
455
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
456 UIWIDGET ui_grid_create(UiObject *obj, UiContainerArgs *args) {
271
94d44bdcad3e add new scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 267
diff changeset
457 UiObject* current = uic_current_obj(obj);
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
458 UI_APPLY_LAYOUT2(current, args);
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
459 GtkWidget *widget;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
460
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
461 GtkWidget *grid = ui_create_grid_widget(args->columnspacing, args->rowspacing);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
462 ui_set_name_and_style(grid, args->name, args->style_class);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
463 widget = ui_box_set_margin(grid, args->margin);
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
464 current->container->add(current->container, widget);
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
465
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
466 UiObject *newobj = uic_object_new(obj, grid);
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
467 newobj->container = ui_grid_container(obj, grid, args->def_hexpand, args->def_vexpand, args->def_hfill, args->def_vfill);
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
468 uic_obj_add(obj, newobj);
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
469
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
470 return widget;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
471 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
472
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
473 UIWIDGET ui_frame_create(UiObject *obj, UiFrameArgs *args) {
353
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
474 UiObject* current = uic_current_obj(obj);
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
475 UI_APPLY_LAYOUT2(current, args);
353
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
476
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
477 GtkWidget *frame = gtk_frame_new(args->label);
353
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
478 UiObject *newobj = uic_object_new(obj, frame);
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
479 GtkWidget *sub = ui_subcontainer_create(args->subcontainer, newobj, args->spacing, args->columnspacing, args->rowspacing, args->margin);
353
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
480 if(sub) {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
481 FRAME_SET_CHILD(frame, sub);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
482 } else {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
483 newobj->widget = frame;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
484 newobj->container = ui_frame_container(obj, frame);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
485 }
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
486 current->container->add(current->container, frame);
354
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
487 uic_obj_add(obj, newobj);
353
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
488
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
489 return frame;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
490 }
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
491
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
492 UIEXPORT UIWIDGET ui_expander_create(UiObject *obj, UiFrameArgs *args) {
354
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
493 UiObject* current = uic_current_obj(obj);
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
494 UI_APPLY_LAYOUT2(current, args);
354
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
495
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
496 GtkWidget *expander = gtk_expander_new(args->label);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
497 gtk_expander_set_expanded(GTK_EXPANDER(expander), args->isexpanded);
354
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
498 UiObject *newobj = uic_object_new(obj, expander);
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
499 GtkWidget *sub = ui_subcontainer_create(args->subcontainer, newobj, args->spacing, args->columnspacing, args->rowspacing, args->margin);
354
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
500 if(sub) {
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
501 EXPANDER_SET_CHILD(expander, sub);
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
502 } else {
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
503 newobj->widget = expander;
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
504 newobj->container = ui_expander_container(obj, expander);
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
505 }
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
506 current->container->add(current->container, expander);
354
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
507 uic_obj_add(obj, newobj);
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
508
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
509 return expander;
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
510 }
baf9bcc98d87 add expander container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
511
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
512
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
513 UIWIDGET ui_scrolledwindow_create(UiObject* obj, UiFrameArgs *args) {
271
94d44bdcad3e add new scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 267
diff changeset
514 UiObject* current = uic_current_obj(obj);
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
515 UI_APPLY_LAYOUT2(current, args);
271
94d44bdcad3e add new scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 267
diff changeset
516
297
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
517 GtkWidget *sw = SCROLLEDWINDOW_NEW();
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
518 ui_set_name_and_style(sw, args->name, args->style_class);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
519 GtkWidget *widget = ui_box_set_margin(sw, args->margin);
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
520 current->container->add(current->container, widget);
350
70305d427f25 fix ui_scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 344
diff changeset
521
271
94d44bdcad3e add new scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 267
diff changeset
522 UiObject *newobj = uic_object_new(obj, sw);
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
523 GtkWidget *sub = ui_subcontainer_create(args->subcontainer, newobj, args->spacing, args->columnspacing, args->rowspacing, args->margin);
353
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
524 if(sub) {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
525 SCROLLEDWINDOW_SET_CHILD(sw, sub);
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
526 } else {
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
527 newobj->widget = sw;
ae999e3346a9 add frame container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 351
diff changeset
528 newobj->container = ui_scrolledwindow_container(obj, sw);
351
63db7e35e2e9 implement scrolledwindow sub container type (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 350
diff changeset
529 }
63db7e35e2e9 implement scrolledwindow sub container type (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 350
diff changeset
530
271
94d44bdcad3e add new scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 267
diff changeset
531 uic_obj_add(obj, newobj);
94d44bdcad3e add new scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 267
diff changeset
532
94d44bdcad3e add new scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 267
diff changeset
533 return sw;
94d44bdcad3e add new scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 267
diff changeset
534 }
94d44bdcad3e add new scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 267
diff changeset
535
94d44bdcad3e add new scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 267
diff changeset
536
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
537 void ui_notebook_tab_select(UIWIDGET tabview, int tab) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
538 gtk_notebook_set_current_page(GTK_NOTEBOOK(tabview), tab);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
539 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
540
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
541 void ui_notebook_tab_remove(UIWIDGET tabview, int tab) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
542 gtk_notebook_remove_page(GTK_NOTEBOOK(tabview), tab);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
543 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
544
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
545 void ui_notebook_tab_add(UIWIDGET widget, int index, const char *name, UIWIDGET child) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
546 gtk_notebook_insert_page(
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
547 GTK_NOTEBOOK(widget),
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
548 child,
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
549 gtk_label_new(name),
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
550 index);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
551 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
552
330
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
553 int64_t ui_notebook_get(UiInteger *i) {
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
554 GtkNotebook *nb = i->obj;
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
555 i->value = gtk_notebook_get_current_page(nb);
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
556 return i->value;
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
557 }
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
558
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
559 void ui_notebook_set(UiInteger *i, int64_t value) {
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
560 GtkNotebook *nb = i->obj;
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
561 gtk_notebook_set_current_page(nb, value);
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
562 i->value = gtk_notebook_get_current_page(nb);
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
563 }
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
564
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
565
333
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
566 #if GTK_MAJOR_VERSION >= 4
332
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
567 static int stack_set_page(GtkWidget *stack, int index) {
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
568 GtkSelectionModel *pages = gtk_stack_get_pages(GTK_STACK(stack));
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
569 GListModel *list = G_LIST_MODEL(pages);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
570 GtkStackPage *page = g_list_model_get_item(list, index);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
571 if(page) {
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
572 gtk_stack_set_visible_child(GTK_STACK(stack), gtk_stack_page_get_child(page));
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
573 } else {
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
574 fprintf(stderr, "UI Error: ui_stack_set value out of bounds\n");
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
575 return -1;
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
576 }
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
577 return index;
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
578 }
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
579
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
580 void ui_stack_tab_select(UIWIDGET tabview, int tab) {
332
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
581 stack_set_page(tabview, tab);
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
582 }
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
583
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
584 void ui_stack_tab_remove(UIWIDGET tabview, int tab) {
332
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
585 GtkStack *stack = GTK_STACK(tabview);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
586 GtkWidget *current = gtk_stack_get_visible_child(stack);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
587 GtkSelectionModel *pages = gtk_stack_get_pages(stack);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
588 GListModel *list = G_LIST_MODEL(pages);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
589 GtkStackPage *page = g_list_model_get_item(list, tab);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
590 if(page) {
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
591 gtk_stack_remove(stack, gtk_stack_page_get_child(page));
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
592 }
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
593 }
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
594
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
595 void ui_stack_tab_add(UIWIDGET widget, int index, const char *name, UIWIDGET child) {
332
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
596 (void)gtk_stack_add_titled(GTK_STACK(widget), child, name, name);
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
597 }
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
598
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
599 int64_t ui_stack_get(UiInteger *i) {
332
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
600 GtkStack *stack = GTK_STACK(i->obj);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
601 GtkWidget *current = gtk_stack_get_visible_child(stack);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
602 GtkSelectionModel *pages = gtk_stack_get_pages(stack);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
603 GListModel *list = G_LIST_MODEL(pages);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
604 int nitems = g_list_model_get_n_items(list);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
605 for(int p=0;p<nitems;p++) {
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
606 GtkStackPage *page = g_list_model_get_item(list, p);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
607 GtkWidget *child = gtk_stack_page_get_child(page);
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
608 if(child == current) {
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
609 i->value = p;
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
610 break;
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
611 }
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
612 }
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
613 return i->value;
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
614 }
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
615
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
616 void ui_stack_set(UiInteger *i, int64_t value) {
332
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
617 GtkWidget *widget = i->obj;
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
618 if(stack_set_page(widget, value) >= 0) {
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
619 i->value = value;
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
620 }
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
621 }
333
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
622 #elif GTK_MAJOR_VERSION >= 3
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
623 static GtkWidget* stack_get_child(GtkWidget *stack, int index) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
624 GList *children = gtk_container_get_children(GTK_CONTAINER(stack));
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
625 if(children) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
626 return g_list_nth_data(children, index);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
627 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
628 return NULL;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
629 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
630
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
631 void ui_stack_tab_select(UIWIDGET tabview, int tab) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
632 GtkWidget *child = stack_get_child(tabview, tab);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
633 if(child) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
634 gtk_stack_set_visible_child(GTK_STACK(tabview), child);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
635 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
636 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
637
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
638 void ui_stack_tab_remove(UIWIDGET tabview, int tab) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
639 GtkWidget *child = stack_get_child(tabview, tab);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
640 if(child) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
641 gtk_container_remove(GTK_CONTAINER(tabview), child);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
642 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
643 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
644
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
645 void ui_stack_tab_add(UIWIDGET widget, int index, const char *name, UIWIDGET child) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
646 gtk_stack_add_titled(GTK_STACK(widget), child, name, name);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
647 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
648
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
649 int64_t ui_stack_get(UiInteger *i) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
650 GtkWidget *visible = gtk_stack_get_visible_child(GTK_STACK(i->obj));
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
651 GList *children = gtk_container_get_children(GTK_CONTAINER(i->obj));
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
652 GList *elm = children;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
653 int n = 0;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
654 int64_t v = -1;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
655 while(elm) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
656 GtkWidget *child = elm->data;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
657 if(child == visible) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
658 v = n;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
659 break;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
660 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
661
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
662 elm = elm->next;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
663 n++;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
664 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
665 g_list_free(children);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
666 i->value = v;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
667 return v;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
668 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
669
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
670 void ui_stack_set(UiInteger *i, int64_t value) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
671 GtkWidget *child = stack_get_child(i->obj, value);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
672 if(child) {
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
673 gtk_stack_set_visible_child(GTK_STACK(i->obj), child);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
674 i->value = value;
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
675 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
676 }
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
677
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
678 #endif
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
679
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
680
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
681
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
682
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
683 UiGtkTabView* ui_widget_get_tabview_data(UIWIDGET tabview) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
684 return g_object_get_data(G_OBJECT(tabview), "ui_tabview");
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
685 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
686
604
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
687 static void tabview_switch_page(
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
688 GtkNotebook *self,
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
689 GtkWidget *page,
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
690 guint page_num,
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
691 gpointer userdata)
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
692 {
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
693 UiGtkTabView *tabview = userdata;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
694 if(!tabview->onchange) {
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
695 return;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
696 }
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
697
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
698 UiEvent event;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
699 event.obj = tabview->obj;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
700 event.window = event.obj->window;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
701 event.document = event.obj->ctx->document;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
702 event.set = ui_get_setop();
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
703 event.eventdata = NULL;
659
d6baaa93f7be add UiEvent eventdatatype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 608
diff changeset
704 event.eventdatatype = 0;
604
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
705 event.intval = page_num;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
706
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
707 tabview->onchange(&event, tabview->onchange);
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
708 }
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
709
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
710 #if GTK_CHECK_VERSION(3, 10, 0)
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
711
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
712 static void tabview_stack_changed(
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
713 GObject *object,
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
714 GParamSpec *pspec,
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
715 UiGtkTabView *tabview)
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
716 {
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
717 if(!tabview->onchange) {
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
718 return;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
719 }
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
720
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
721 UiEvent event;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
722 event.obj = tabview->obj;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
723 event.window = event.obj->window;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
724 event.document = event.obj->ctx->document;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
725 event.set = ui_get_setop();
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
726 event.eventdata = NULL;
659
d6baaa93f7be add UiEvent eventdatatype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 608
diff changeset
727 event.eventdatatype = 0;
604
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
728 event.intval = 0;
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
729
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
730 tabview->onchange(&event, tabview->onchange);
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
731 }
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
732
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
733 #endif
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
734
330
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
735 typedef int64_t(*ui_tabview_get_func)(UiInteger*);
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
736 typedef void (*ui_tabview_set_func)(UiInteger*, int64_t);
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
737
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
738 UIWIDGET ui_tabview_create(UiObject* obj, UiTabViewArgs *args) {
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
739 UiGtkTabView *data = malloc(sizeof(UiGtkTabView));
606
72f8b89d3e04 fix missing UiGtkTabView initialization (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 604
diff changeset
740 memset(data, 0, sizeof(UiGtkTabView));
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
741 data->margin = args->margin;
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
742 data->spacing = args->spacing;
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
743 data->columnspacing = args->columnspacing;
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
744 data->rowspacing = args->rowspacing;
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
745
330
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
746 ui_tabview_get_func getfunc = NULL;
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
747 ui_tabview_set_func setfunc = NULL;
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
748
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
749 GtkWidget *widget = NULL;
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
750 GtkWidget *data_widget = NULL;
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
751 switch(args->tabview) {
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
752 case UI_TABVIEW_DOC: {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
753 // TODO
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
754 break;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
755 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
756 case UI_TABVIEW_NAVIGATION_SIDE: {
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
757 #if GTK_CHECK_VERSION(3, 10, 0)
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
758 widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
759 GtkWidget *sidebar = gtk_stack_sidebar_new();
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
760 BOX_ADD(widget, sidebar);
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
761 GtkWidget *stack = gtk_stack_new();
604
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
762 g_signal_connect(stack, "notify::visible-child", G_CALLBACK(tabview_stack_changed), data);
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
763 gtk_stack_set_transition_type (GTK_STACK(stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
764 gtk_stack_sidebar_set_stack(GTK_STACK_SIDEBAR(sidebar), GTK_STACK(stack));
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
765 BOX_ADD_EXPAND(widget, stack);
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
766 data->select_tab = ui_stack_tab_select;
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
767 data->remove_tab = ui_stack_tab_remove;
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
768 data->add_tab = ui_stack_tab_add;
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
769 getfunc = ui_stack_get;
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
770 setfunc = ui_stack_set;
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
771 data_widget = stack;
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
772 #else
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
773 // TODO
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
774 #endif
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
775 break;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
776 }
330
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
777 case UI_TABVIEW_DEFAULT: /* fall through */
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
778 case UI_TABVIEW_NAVIGATION_TOP: /* fall through */
333
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
779 case UI_TABVIEW_INVISIBLE: /* fall through */
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
780 case UI_TABVIEW_NAVIGATION_TOP2: {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
781 widget = gtk_notebook_new();
604
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
782 g_signal_connect(
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
783 widget,
608
046c7c4cb411 fix gtk notebook switch-page signal (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 606
diff changeset
784 "switch-page",
604
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
785 G_CALLBACK(tabview_switch_page),
0afad58e3078 add tabview onchange callback (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 594
diff changeset
786 data);
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
787 data_widget = widget;
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
788 data->select_tab = ui_notebook_tab_select;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
789 data->remove_tab = ui_notebook_tab_remove;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
790 data->add_tab = ui_notebook_tab_add;
330
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
791 getfunc = ui_notebook_get;
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
792 setfunc = ui_notebook_set;
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
793 if(args->tabview == UI_TABVIEW_INVISIBLE) {
333
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
794 gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widget), FALSE);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
795 gtk_notebook_set_show_border(GTK_NOTEBOOK(widget), FALSE);
634e3ce80afe implement gtk3 stack tabview
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
796 }
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
797 break;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
798 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
799 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
800
330
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
801 UiObject* current = uic_current_obj(obj);
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
802 if(args->value || args->varname) {
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
803 UiVar *var = uic_widget_var(obj->ctx, current->ctx, args->value, args->varname, UI_VAR_INTEGER);
330
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
804 UiInteger *i = var->value;
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
805 i->get = getfunc;
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
806 i->set = setfunc;
332
7e7c05af8f3a implement stack set/get/remove (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
807 i->obj = data_widget;
330
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
808 }
d615aa36c98e add tabview value/varname parameter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 328
diff changeset
809
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
810 g_object_set_data(G_OBJECT(widget), "ui_tabview", data);
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
811 data->widget = data_widget;
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
812 data->subcontainer = args->subcontainer;
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
813
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
814 UI_APPLY_LAYOUT2(current, args);
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
815 current->container->add(current->container, widget);
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
816
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
817 UiObject *newobj = uic_object_new(obj, widget);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
818 newobj->container = ui_tabview_container(obj, widget);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
819 uic_obj_add(obj, newobj);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
820 data->obj = newobj;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
821
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
822 return widget;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
823 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
824
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
825 void ui_tab_create(UiObject* obj, const char* title) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
826 UiObject* current = uic_current_obj(obj);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
827 UiGtkTabView *data = ui_widget_get_tabview_data(current->widget);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
828 if(!data) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
829 fprintf(stderr, "UI Error: widget is not a tabview\n");
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
830 return;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
831 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
832
331
cdad8b7e83db implement side navigation tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
833 UiObject *newobj = ui_tabview_add(current->widget, title, -1);
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
834 current->next = newobj;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
835 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
836
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
837
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
838
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
839 void ui_tabview_select(UIWIDGET tabview, int tab) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
840 UiGtkTabView *data = ui_widget_get_tabview_data(tabview);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
841 if(!data) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
842 fprintf(stderr, "UI Error: widget is not a tabview\n");
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
843 return;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
844 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
845 data->select_tab(tabview, tab);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
846 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
847
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
848 void ui_tabview_remove(UIWIDGET tabview, int tab) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
849 UiGtkTabView *data = ui_widget_get_tabview_data(tabview);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
850 if(!data) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
851 fprintf(stderr, "UI Error: widget is not a tabview\n");
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
852 return;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
853 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
854 data->remove_tab(tabview, tab);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
855 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
856
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
857 UiObject* ui_tabview_add(UIWIDGET tabview, const char *name, int tab_index) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
858 UiGtkTabView *data = ui_widget_get_tabview_data(tabview);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
859 if(!data) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
860 fprintf(stderr, "UI Error: widget is not a tabview\n");
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
861 return NULL;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
862 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
863
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
864 UiObject *newobj = cxCalloc(data->obj->ctx->allocator, 1, sizeof(UiObject));
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
865 newobj->ctx = data->obj->ctx;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
866
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
867 GtkWidget *sub;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
868 switch(data->subcontainer) {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
869 default: {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
870 sub = ui_gtk_vbox_new(data->spacing);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
871 newobj->container = ui_box_container(newobj, sub, data->subcontainer);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
872 break;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
873 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
874 case UI_CONTAINER_HBOX: {
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
875 sub = ui_gtk_hbox_new(data->spacing);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
876 newobj->container = ui_box_container(newobj, sub, data->subcontainer);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
877 break;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
878 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
879 case UI_CONTAINER_GRID: {
344
870dd3d41d83 add dialog window (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 336
diff changeset
880 sub = ui_create_grid_widget(data->columnspacing, data->rowspacing);
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
881 newobj->container = ui_grid_container(newobj, sub, FALSE, FALSE, FALSE, FALSE);
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
882 break;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
883 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
884 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
885 newobj->widget = sub;
344
870dd3d41d83 add dialog window (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 336
diff changeset
886 GtkWidget *widget = ui_box_set_margin(sub, data->margin);
328
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
887
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
888 data->add_tab(data->widget, tab_index, name, widget);
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
889
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
890 return newobj;
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
891 }
059cba080ab4 implement new tabview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 313
diff changeset
892
336
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
893
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
894 /* -------------------- Headerbar -------------------- */
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
895
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
896 static void hb_set_part(UiObject *obj, int part) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
897 UiObject* current = uic_current_obj(obj);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
898 GtkWidget *headerbar = current->widget;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
899
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
900 UiHeaderbarContainer *hb = cxCalloc(
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
901 obj->ctx->allocator,
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
902 1,
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
903 sizeof(UiHeaderbarContainer));
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
904 memcpy(hb, current->container, sizeof(UiHeaderbarContainer));
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
905
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
906 UiObject *newobj = uic_object_new(obj, headerbar);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
907 newobj->container = (UiContainer*)hb;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
908 uic_obj_add(obj, newobj);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
909
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
910 hb->part = part;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
911 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
912
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
913 void ui_headerbar_start_create(UiObject *obj) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
914 hb_set_part(obj, 0);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
915 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
916
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
917 void ui_headerbar_center_create(UiObject *obj) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
918 hb_set_part(obj, 2);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
919 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
920
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
921 void ui_headerbar_end_create(UiObject *obj) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
922 hb_set_part(obj, 1);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
923 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
924
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
925 UIWIDGET ui_headerbar_fallback_create(UiObject *obj, UiHeaderbarArgs *args) {
336
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
926 UiObject *current = uic_current_obj(obj);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
927 UiContainer *ct = current->container;
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
928 UI_APPLY_LAYOUT2(current, args);
336
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
929
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
930 GtkWidget *box = ui_gtk_hbox_new(args->alt_spacing);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
931 ui_set_name_and_style(box, args->name, args->style_class);
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
932 ct->add(ct, box);
336
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
933
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
934 UiObject *newobj = uic_object_new(obj, box);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
935 newobj->container = ui_headerbar_fallback_container(obj, box);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
936 uic_obj_add(obj, newobj);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
937
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
938 return box;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
939 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
940
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
941 static void hb_fallback_set_part(UiObject *obj, int part) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
942 UiObject* current = uic_current_obj(obj);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
943 GtkWidget *headerbar = current->widget;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
944
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
945 UiObject *newobj = uic_object_new(obj, headerbar);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
946 newobj->container = ui_headerbar_container(obj, headerbar);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
947 uic_obj_add(obj, newobj);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
948
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
949 UiHeaderbarContainer *hb = (UiHeaderbarContainer*)newobj->container;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
950 hb->part = part;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
951 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
952
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
953 UiContainer* ui_headerbar_fallback_container(UiObject *obj, GtkWidget *headerbar) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
954 UiHeaderbarContainer *ct = cxCalloc(
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
955 obj->ctx->allocator,
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
956 1,
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
957 sizeof(UiHeaderbarContainer));
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
958 ct->container.widget = headerbar;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
959 ct->container.add = ui_headerbar_fallback_container_add;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
960 return (UiContainer*)ct;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
961 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
962
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
963 void ui_headerbar_fallback_container_add(UiContainer *ct, GtkWidget *widget) {
336
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
964 UiHeaderbarContainer *hb = (UiHeaderbarContainer*)ct;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
965 BOX_ADD(ct->widget, widget);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
966 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
967
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
968 #if GTK_CHECK_VERSION(3, 10, 0)
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
969
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
970 UIWIDGET ui_headerbar_create(UiObject *obj, UiHeaderbarArgs *args) {
336
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
971 GtkWidget *headerbar = g_object_get_data(G_OBJECT(obj->widget), "ui_headerbar");
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
972 if(!headerbar) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
973 return ui_headerbar_fallback_create(obj, args);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
974 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
975
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
976 UiObject *newobj = uic_object_new(obj, headerbar);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
977 newobj->container = ui_headerbar_container(obj, headerbar);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
978 uic_obj_add(obj, newobj);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
979
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
980 return headerbar;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
981 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
982
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
983 UiContainer* ui_headerbar_container(UiObject *obj, GtkWidget *headerbar) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
984 UiHeaderbarContainer *ct = cxCalloc(
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
985 obj->ctx->allocator,
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
986 1,
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
987 sizeof(UiHeaderbarContainer));
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
988 ct->container.widget = headerbar;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
989 ct->container.add = ui_headerbar_container_add;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
990 return (UiContainer*)ct;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
991 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
992
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
993 void ui_headerbar_container_add(UiContainer *ct, GtkWidget *widget) {
336
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
994 UiHeaderbarContainer *hb = (UiHeaderbarContainer*)ct;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
995 if(hb->part == 0) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
996 UI_HEADERBAR_PACK_START(ct->widget, widget);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
997 } else if(hb->part == 1) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
998 UI_HEADERBAR_PACK_END(ct->widget, widget);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
999 } else if(hb->part == 2) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1000 if(!hb->centerbox) {
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1001 GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1002 hb->centerbox = box;
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1003 UI_HEADERBAR_SET_TITLE_WIDGET(ct->widget, box);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1004 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1005 BOX_ADD(hb->centerbox, widget);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1006 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1007 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1008
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1009 #else
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1010
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1011 UIWIDGET ui_headerbar_create(UiObject *obj, UiHeaderbarArgs *args) {
336
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1012 return ui_headerbar_fallback_create(obj, args);
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1013 }
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1014
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1015 #endif
56c12f44c2d3 add custom headerbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1016
409
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1017 /* -------------------- Sidebar -------------------- */
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1018
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1019 #ifdef UI_LIBADWAITA
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1020 UIWIDGET ui_sidebar_create(UiObject *obj, UiSidebarArgs *args) {
409
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1021 GtkWidget *sidebar_toolbar_view = g_object_get_data(G_OBJECT(obj->widget), "ui_sidebar");
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1022 if(!sidebar_toolbar_view) {
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1023 fprintf(stderr, "Error: window is not configured for sidebar\n");
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1024 return NULL;
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1025 }
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1026
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1027 GtkWidget *box = ui_gtk_vbox_new(args->spacing);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1028 ui_box_set_margin(box, args->margin);
409
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1029 adw_toolbar_view_set_content(ADW_TOOLBAR_VIEW(sidebar_toolbar_view), box);
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1030
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1031 UiObject *newobj = uic_object_new(obj, box);
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1032 newobj->container = ui_box_container(obj, box, UI_CONTAINER_VBOX);
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1033 uic_obj_add(obj, newobj);
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1034
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1035 return box;
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1036 }
410
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1037 #else
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1038 UIWIDGET ui_sidebar_create(UiObject *obj, UiSidebarArgs *args) {
410
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1039 GtkWidget *sidebar_vbox = g_object_get_data(G_OBJECT(obj->widget), "ui_sidebar");
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1040
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1041 GtkWidget *box = ui_gtk_vbox_new(args->spacing);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1042 ui_box_set_margin(box, args->margin);
410
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1043 BOX_ADD_EXPAND(sidebar_vbox, box);
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1044
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1045 UiObject *newobj = uic_object_new(obj, box);
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1046 newobj->container = ui_box_container(obj, box, UI_CONTAINER_VBOX);
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1047 uic_obj_add(obj, newobj);
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1048
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1049 return box;
a080c69125d1 add sidebar implementation (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 409
diff changeset
1050 }
409
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1051 #endif
86fbc80f0be7 add sidebar (libadwaita)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 378
diff changeset
1052
165
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1053 /* -------------------- Splitpane -------------------- */
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1054
165
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1055 static GtkWidget* create_paned(UiOrientation orientation) {
297
a73c60adf188 port container to gtk4
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
1056 #if GTK_MAJOR_VERSION >= 3
165
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1057 switch(orientation) {
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1058 case UI_HORIZONTAL: return gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1059 case UI_VERTICAL: return gtk_paned_new(GTK_ORIENTATION_VERTICAL);
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1060 }
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1061 #else
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1062 switch(orientation) {
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1063 case UI_HORIZONTAL: return gtk_hpaned_new();
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1064 case UI_VERTICAL: return gtk_vpaned_new();
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1065 }
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1066 #endif
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1067 return NULL;
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1068 }
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1069
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1070
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
1071
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1072 static UIWIDGET splitpane_create(UiObject *obj, UiOrientation orientation, UiSplitPaneArgs *args) {
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1073 UiObject* current = uic_current_obj(obj);
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1074
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1075 GtkWidget *pane0 = create_paned(orientation);
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1076
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1077 UI_APPLY_LAYOUT2(current, args);
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
1078 current->container->add(current->container, pane0);
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1079
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1080 int max = args->max_panes == 0 ? 2 : args->max_panes;
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1081
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1082 UiObject *newobj = uic_object_new(obj, pane0);
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1083 newobj->container = ui_splitpane_container(obj, pane0, orientation, max, args->initial_position);
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1084 uic_obj_add(obj, newobj);
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1085
483
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1086 g_object_set_data(G_OBJECT(pane0), "ui_splitpane", newobj->container);
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1087
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1088 return pane0;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1089 }
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1090
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1091 UIWIDGET ui_hsplitpane_create(UiObject *obj, UiSplitPaneArgs *args) {
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1092 return splitpane_create(obj, UI_HORIZONTAL, args);
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1093 }
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1094
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1095 UIWIDGET ui_vsplitpane_create(UiObject *obj, UiSplitPaneArgs *args) {
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1096 return splitpane_create(obj, UI_VERTICAL, args);
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1097 }
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1098
493
b045c70d7c02 implement splitpane initial_position (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
1099 UiContainer* ui_splitpane_container(UiObject *obj, GtkWidget *pane, UiOrientation orientation, int max, int init) {
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1100 UiSplitPaneContainer *ct = ui_calloc(obj->ctx, 1, sizeof(UiSplitPaneContainer));
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1101 ct->container.widget = pane;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1102 ct->container.add = ui_splitpane_container_add;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1103 ct->current_pane = pane;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1104 ct->orientation = orientation;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1105 ct->max = max;
493
b045c70d7c02 implement splitpane initial_position (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
1106 ct->initial_position = init;
483
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1107 ct->children = cxArrayListCreateSimple(CX_STORE_POINTERS, 4);
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1108 return (UiContainer*)ct;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1109 }
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1110
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
1111 void ui_splitpane_container_add(UiContainer *ct, GtkWidget *widget) {
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1112 UiSplitPaneContainer *s = (UiSplitPaneContainer*)ct;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1113
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1114 if(s->nchildren >= s->max) {
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1115 fprintf(stderr, "splitpane: maximum number of children reached\n");
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1116 return;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1117 }
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1118
483
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1119 cxListAdd(s->children, widget);
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1120
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1121 if(s->pos == 0) {
490
0206161e92d5 fix gtk3 build and implement new combobox
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 485
diff changeset
1122 PANED_SET_CHILD1(s->current_pane, widget);
493
b045c70d7c02 implement splitpane initial_position (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
1123 if(s->initial_position > 0) {
b045c70d7c02 implement splitpane initial_position (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
1124 gtk_paned_set_position(GTK_PANED(s->current_pane), s->initial_position);
b045c70d7c02 implement splitpane initial_position (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
1125 }
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1126 s->pos++;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1127 s->nchildren++;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1128 } else {
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1129 if(s->nchildren+1 == s->max) {
490
0206161e92d5 fix gtk3 build and implement new combobox
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 485
diff changeset
1130 PANED_SET_CHILD2(s->current_pane, widget);
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1131 } else {
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1132 GtkWidget *pane = create_paned(s->orientation);
490
0206161e92d5 fix gtk3 build and implement new combobox
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 485
diff changeset
1133 PANED_SET_CHILD1(pane, widget);
0206161e92d5 fix gtk3 build and implement new combobox
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 485
diff changeset
1134 PANED_SET_CHILD2(s->current_pane, pane);
456
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1135 s->current_pane = pane;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1136 }
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1137
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1138 s->pos = 0;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1139 s->nchildren++;
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1140 }
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1141 }
6712b08e4f74 add new splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 442
diff changeset
1142
483
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1143 UIEXPORT void ui_splitpane_set_visible(UIWIDGET splitpane, int child_index, UiBool visible) {
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1144 UiSplitPaneContainer *ct = g_object_get_data(G_OBJECT(splitpane), "ui_splitpane");
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1145 if(!ct) {
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1146 fprintf(stderr, "UI Error: not a splitpane\n");
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1147 return;
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1148 }
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1149
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1150 GtkWidget *w = cxListAt(ct->children, child_index);
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1151 if(w) {
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1152 gtk_widget_set_visible(w, visible);
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1153 }
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1154 }
069fca2a47c2 add ui_splitpane_set_visible (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
1155
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1156 /* -------------------- ItemList Container -------------------- */
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1157
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1158 static void remove_item(void *data, void *item) {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1159 UiGtkItemListContainer *ct = data;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1160 UiObject *obj = item;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1161 if(ct->remove_items) {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1162 BOX_REMOVE(ct->widget, obj->widget);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1163 }
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1164 uic_object_destroy(obj);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1165 }
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1166
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1167 static void update_itemlist(UiList *list, int c) {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1168 UiGtkItemListContainer *ct = list->obj;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1169
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1170 CxMap *new_items = cxHashMapCreateSimple(CX_STORE_POINTERS);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1171 new_items->collection.advanced_destructor = remove_item;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1172 new_items->collection.destructor_data = ct;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1173
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1174 // only create new widgets for new elements, so at first we have
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1175 // to find which elements are new
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1176 // check which elements in the list are already in the container
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1177 void *elm = list->first(list);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1178 int j = 0;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1179 while(elm) {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1180 CxHashKey key = cx_hash_key(&elm, sizeof(void*));
440
7c4b9cba09ca update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 422
diff changeset
1181 UiObject *item_obj = NULL;
7c4b9cba09ca update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 422
diff changeset
1182 cxMapRemoveAndGet(ct->current_items, key, &item_obj);
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1183 if(item_obj) {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1184 g_object_ref(G_OBJECT(item_obj->widget));
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1185 BOX_REMOVE(ct->widget, item_obj->widget);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1186 cxMapPut(new_items, key, item_obj);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1187 }
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1188 elm = list->next(list);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1189 j++;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1190 }
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1191
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1192 // ct->current_items only contains elements, that are not in the list
440
7c4b9cba09ca update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 422
diff changeset
1193 cxMapFree(ct->current_items); // calls destructor remove_item
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1194 ct->current_items = new_items;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1195
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1196 // add all items
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1197 int index = 0;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1198 elm = list->first(list);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1199 while(elm) {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1200 CxHashKey key = cx_hash_key(&elm, sizeof(void*));
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1201 UiObject *item_obj = cxMapGet(ct->current_items, key);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1202 if(item_obj) {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1203 // re-add previously created widget
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
1204 ui_box_container_add(ct->container, item_obj->widget);
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1205 } else {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1206 // create new widget and object for this list element
471
063a9f29098c ucx update + fix doc attach/detach + fix ui_set with unbound values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 465
diff changeset
1207 CxMempool *mp = cxMempoolCreateSimple(256);
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1208 const CxAllocator *a = mp->allocator;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1209 UiObject *obj = cxCalloc(a, 1, sizeof(UiObject));
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1210 obj->ctx = uic_context(obj, mp);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1211 obj->window = NULL;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1212 obj->widget = ui_subcontainer_create(
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1213 ct->subcontainer,
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1214 obj,
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1215 ct->spacing,
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1216 ct->columnspacing,
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1217 ct->rowspacing,
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1218 ct->margin);
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
1219 ui_box_container_add(ct->container, obj->widget);
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1220 if(ct->create_ui) {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1221 ct->create_ui(obj, index, elm, ct->userdata);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1222 }
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1223 cxMapPut(new_items, key, obj);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1224 }
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1225 elm = list->next(list);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1226 index++;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1227 }
552
131059d41671 make sure item list widgets are shown (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 493
diff changeset
1228
131059d41671 make sure item list widgets are shown (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 493
diff changeset
1229 #if GTK_MAJOR_VERSION < 4
131059d41671 make sure item list widgets are shown (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 493
diff changeset
1230 gtk_widget_show_all(ct->widget);
131059d41671 make sure item list widgets are shown (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 493
diff changeset
1231 #endif
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1232 }
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1233
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1234 static void destroy_itemlist_container(GtkWidget *w, UiGtkItemListContainer *container) {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1235 container->remove_items = FALSE;
440
7c4b9cba09ca update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 422
diff changeset
1236 cxMapFree(container->current_items);
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1237 free(container);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1238 }
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1239
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1240 UIWIDGET ui_itemlist_create(UiObject *obj, UiItemListContainerArgs *args) {
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1241 UiObject *current = uic_current_obj(obj);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1242 UiContainer *ct = current->container;
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1243 UI_APPLY_LAYOUT2(current, args);
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1244
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1245 GtkWidget *box = args->container == UI_CONTAINER_VBOX ? ui_gtk_vbox_new(args->spacing) : ui_gtk_hbox_new(args->spacing);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1246 ui_set_name_and_style(box, args->name, args->style_class);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1247 GtkWidget *widget = args->margin > 0 ? ui_box_set_margin(box, args->margin) : box;
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
1248 ct->add(ct, widget);
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1249
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1250 UiGtkItemListContainer *container = malloc(sizeof(UiGtkItemListContainer));
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1251 container->parent = obj;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1252 container->widget = box;
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1253 container->container = ui_box_container(current, box, args->container);
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1254 container->create_ui = args->create_ui;
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1255 container->userdata = args->userdata;
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1256 container->subcontainer = args->subcontainer;
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1257 container->current_items = cxHashMapCreateSimple(CX_STORE_POINTERS);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1258 container->current_items->collection.advanced_destructor = remove_item;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1259 container->current_items->collection.destructor_data = container;
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1260 container->margin = args->sub_margin;
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1261 container->spacing = args->sub_spacing;
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1262 container->columnspacing = args->sub_columnspacing;
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1263 container->rowspacing = args->sub_rowspacing;
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1264 container->remove_items = TRUE;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1265
594
fc854e0ab924 pass Args structs per pointer (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 552
diff changeset
1266 UiVar* var = uic_widget_var(obj->ctx, current->ctx, args->value, args->varname, UI_VAR_LIST);
422
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1267 if(var) {
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1268 UiList *list = var->value;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1269 list->obj = container;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1270 list->update = update_itemlist;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1271 update_itemlist(list, 0);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1272 }
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1273 g_signal_connect(
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1274 box,
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1275 "destroy",
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1276 G_CALLBACK(destroy_itemlist_container),
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1277 container);
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1278
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1279 return box;
c1354a29a7e9 add item list container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1280 }
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1281
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1282
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1283
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1284 /*
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1285 * -------------------- Layout Functions --------------------
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1286 *
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1287 * functions for setting layout attributes for the current container
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1288 *
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1289 */
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1290
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1291 void ui_layout_fill(UiObject *obj, UiBool fill) {
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1292 UiContainer *ct = uic_get_current_container(obj);
669
5b930e8c3a87 simplify layout fill option, remove fill parameter from container add function (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 659
diff changeset
1293 ct->layout.fill = fill;
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
1294 }
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
1295
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
1296 void ui_layout_hexpand(UiObject *obj, UiBool expand) {
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
1297 UiContainer *ct = uic_get_current_container(obj);
111
40dbf1a7526a added close handler to UiContext (GTK, Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 110
diff changeset
1298 ct->layout.hexpand = expand;
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
1299 }
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
1300
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
1301 void ui_layout_vexpand(UiObject *obj, UiBool expand) {
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
1302 UiContainer *ct = uic_get_current_container(obj);
111
40dbf1a7526a added close handler to UiContext (GTK, Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 110
diff changeset
1303 ct->layout.vexpand = expand;
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
1304 }
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
1305
378
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1306 void ui_layout_hfill(UiObject *obj, UiBool fill) {
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1307 UiContainer *ct = uic_get_current_container(obj);
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1308 ct->layout.hfill = fill;
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1309 }
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1310
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1311 void ui_layout_vfill(UiObject *obj, UiBool fill) {
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1312 UiContainer *ct = uic_get_current_container(obj);
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1313 ct->layout.vfill = fill;
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1314 }
d41b1ffc5f77 implement some missing WinUI functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1315
465
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
1316 UIEXPORT void ui_layout_override_defaults(UiObject *obj, UiBool d) {
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
1317 UiContainer *ct = uic_get_current_container(obj);
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
1318 ct->layout.override_defaults = d;
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
1319 }
00735562b25b implement hfill/vfill, def_hfill/def_vfill and override_defaults (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
1320
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
1321 void ui_layout_colspan(UiObject* obj, int cols) {
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
1322 UiContainer* ct = uic_get_current_container(obj);
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
1323 ct->layout.colspan = cols;
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
1324 }
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
1325
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
1326 void ui_layout_rowspan(UiObject* obj, int rows) {
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
1327 UiContainer* ct = uic_get_current_container(obj);
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
1328 ct->layout.rowspan = rows;
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
1329 }
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
1330
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
1331 void ui_newline(UiObject *obj) {
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
1332 UiContainer *ct = uic_get_current_container(obj);
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
1333 ct->layout.newline = TRUE;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
1334 }
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
1335

mercurial