ui/gtk/container.c

Mon, 08 Dec 2025 11:36:46 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Mon, 08 Dec 2025 11:36:46 +0100
changeset 979
471ca81a72f5
parent 941
e7459e9fbed2
child 987
77c5e7cadf96
permissions
-rw-r--r--

fix wrong data index when dynamically adding columns

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

mercurial