ui/gtk/container.c

Fri, 16 Feb 2024 18:33:34 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Fri, 16 Feb 2024 18:33:34 +0100
branch
newapi
changeset 263
a0ea718ab1d8
parent 260
eebb0626d020
child 267
79dd183dd4cb
permissions
-rw-r--r--

fix add_menuitem_widget passing wrong list type to uic_add_group_widget

4
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
140
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 121
diff changeset
4 * Copyright 2017 Olaf Wintermann. All rights reserved.
4
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdlib.h>
165
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
31 #include <limits.h>
4
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
33 #include "container.h"
165
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
34 #include "toolkit.h"
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
35
4
39b9b86ec452 added simple container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
36 #include "../common/context.h"
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
37 #include "../common/object.h"
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
38
166
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
39
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
40 void ui_container_begin_close(UiObject *obj) {
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
41 UiContainer *ct = uic_get_current_container(obj);
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
42 ct->close = 1;
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
43 }
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 int ui_container_finish(UiObject *obj) {
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
46 UiContainer *ct = uic_get_current_container(obj);
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
47 if(ct->close) {
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
48 ui_end(obj);
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
49 return 0;
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
50 }
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
51 return 1;
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
52 }
6e48030cf2db add container macros (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
53
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
54 GtkWidget* ui_gtk_vbox_new(int spacing) {
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
55 #ifdef UI_GTK3
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
56 return gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing);
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
57 #else
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
58 return gtk_vbox_new(FALSE, spacing);
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
59 #endif
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
60 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
61
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
62 GtkWidget* ui_gtk_hbox_new(int spacing) {
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
63 #ifdef UI_GTK3
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
64 return gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing);
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
65 #else
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
66 return gtk_hbox_new(FALSE, spacing);
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
67 #endif
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
68 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
69
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
70
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
71
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
72 /* -------------------- Box Container -------------------- */
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
73 UiContainer* ui_box_container(UiObject *obj, GtkWidget *box) {
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
74 UiBoxContainer *ct = cxCalloc(
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
75 obj->ctx->allocator,
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
76 1,
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
77 sizeof(UiBoxContainer));
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
78 ct->container.widget = box;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
79 ct->container.add = ui_box_container_add;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
80 return (UiContainer*)ct;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
81 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
82
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
83 void ui_box_container_add(UiContainer *ct, GtkWidget *widget, UiBool fill) {
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
84 UiBoxContainer *bc = (UiBoxContainer*)ct;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
85 if(ct->layout.fill != UI_LAYOUT_UNDEFINED) {
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
86 fill = ui_lb2bool(ct->layout.fill);
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
87 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
88
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
89 if(bc->has_fill && fill) {
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
90 fprintf(stderr, "UiError: container has 2 filled widgets");
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
91 fill = FALSE;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
92 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
93 if(fill) {
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
94 bc->has_fill = TRUE;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
95 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
96
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
97 UiBool expand = fill;
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
98 gtk_box_pack_start(GTK_BOX(ct->widget), widget, expand, fill, 0);
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
99
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
100 ui_reset_layout(ct->layout);
75
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
101 ct->current = widget;
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
102 }
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
103
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
104 UiContainer* ui_grid_container(UiObject *obj, GtkWidget *grid) {
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
105 UiGridContainer *ct = cxCalloc(
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
106 obj->ctx->allocator,
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
107 1,
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
108 sizeof(UiGridContainer));
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
109 ct->container.widget = grid;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
110 ct->container.add = ui_grid_container_add;
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
111 #ifdef UI_GTK2
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
112 ct->width = 0;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
113 ct->height = 1;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
114 #endif
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
115 return (UiContainer*)ct;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
116 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
117
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
118 #ifdef UI_GTK3
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
119 void ui_grid_container_add(UiContainer *ct, GtkWidget *widget, UiBool fill) {
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
120 UiGridContainer *grid = (UiGridContainer*)ct;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
121
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
122 if(ct->layout.newline) {
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
123 grid->x = 0;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
124 grid->y++;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
125 ct->layout.newline = FALSE;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
126 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
127
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
128 int hexpand = FALSE;
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
129 int vexpand = FALSE;
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
130 if(ct->layout.hexpand != UI_LAYOUT_UNDEFINED) {
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
131 hexpand = ct->layout.hexpand;
94
d51e334c1439 added checkbox and labels with alignment (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
132 }
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
133 if(ct->layout.vexpand != UI_LAYOUT_UNDEFINED) {
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
134 vexpand = ct->layout.vexpand;
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
135 }
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
136
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
137 if(hexpand) {
94
d51e334c1439 added checkbox and labels with alignment (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
138 gtk_widget_set_hexpand(widget, TRUE);
d51e334c1439 added checkbox and labels with alignment (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
139 }
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
140 if(vexpand) {
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
141 gtk_widget_set_vexpand(widget, TRUE);
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
142 }
94
d51e334c1439 added checkbox and labels with alignment (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
143
260
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
144 int colspan = ct->layout.colspan > 0 ? ct->layout.colspan : 1;
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
145 int rowspan = ct->layout.rowspan > 0 ? ct->layout.rowspan : 1;
109
b9808f916687 added gridwidth layout option (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
146
260
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
147 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
148 grid->x += colspan;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
149
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
150 ui_reset_layout(ct->layout);
75
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
151 ct->current = widget;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
152 }
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
153 #endif
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
154 #ifdef UI_GTK2
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
155 void ui_grid_container_add(UiContainer *ct, GtkWidget *widget, UiBool fill) {
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
156 UiGridContainer *grid = (UiGridContainer*)ct;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
157
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
158 if(ct->layout.newline) {
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
159 grid->x = 0;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
160 grid->y++;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
161 ct->layout.newline = FALSE;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
162 }
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
163
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
164 int hexpand = FALSE;
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
165 int vexpand = FALSE;
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
166 if(ct->layout.hexpand != UI_LAYOUT_UNDEFINED) {
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
167 hexpand = ct->layout.hexpand;
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
168 }
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
169 if(ct->layout.vexpand != UI_LAYOUT_UNDEFINED) {
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
170 vexpand = ct->layout.vexpand;
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
171 }
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
172 GtkAttachOptions xoptions = hexpand ? GTK_FILL | GTK_EXPAND : GTK_FILL;
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
173 GtkAttachOptions yoptions = vexpand ? GTK_FILL | GTK_EXPAND : GTK_FILL;
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
174
260
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
175 int colspan = ct->layout.colspan > 0 ? ct->layout.colspan : 1;
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
176 int rowspan = ct->layout.rowspan > 0 ? ct->layout.rowspan : 1;
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
177 // TODO: use colspan/rowspan
eebb0626d020 implement grid colspan/rowspan (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 253
diff changeset
178
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
179 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
180 grid->x++;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
181 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
182 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
183 grid->width = nw;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
184 grid->height = grid->y + 1;
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
185 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
186 }
75
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
187
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
188 ui_reset_layout(ct->layout);
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
189 ct->current = widget;
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
190 }
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
191 #endif
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
192
120
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
193 UiContainer* ui_scrolledwindow_container(UiObject *obj, GtkWidget *scrolledwindow) {
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
194 UiContainer *ct = cxCalloc(
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
195 obj->ctx->allocator,
120
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
196 1,
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
197 sizeof(UiContainer));
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
198 ct->widget = scrolledwindow;
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
199 ct->add = ui_scrolledwindow_container_add;
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
200 return ct;
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
201 }
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
202
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
203 void ui_scrolledwindow_container_add(UiContainer *ct, GtkWidget *widget, UiBool fill) {
121
1cc365c34125 added some special textfields (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 120
diff changeset
204 // TODO: check if the widget implements GtkScrollable
1cc365c34125 added some special textfields (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 120
diff changeset
205 #ifdef UI_GTK3
120
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
206 gtk_container_add(GTK_CONTAINER(ct->widget), widget);
121
1cc365c34125 added some special textfields (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 120
diff changeset
207 #else
1cc365c34125 added some special textfields (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 120
diff changeset
208 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(ct->widget), widget);
1cc365c34125 added some special textfields (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 120
diff changeset
209 #endif
120
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
210 ui_reset_layout(ct->layout);
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
211 ct->current = widget;
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
212 }
49bc645df8b7 added scrolledwindow (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
213
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
214 UiContainer* ui_tabview_container(UiObject *obj, GtkWidget *tabview) {
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
215 UiTabViewContainer *ct = cxCalloc(
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 166
diff changeset
216 obj->ctx->allocator,
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
217 1,
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
218 sizeof(UiTabViewContainer));
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
219 ct->container.widget = tabview;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
220 ct->container.add = ui_tabview_container_add;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
221 return (UiContainer*)ct;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
222 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
223
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
224 void ui_tabview_container_add(UiContainer *ct, GtkWidget *widget, UiBool fill) {
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
225 gtk_notebook_append_page(
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
226 GTK_NOTEBOOK(ct->widget),
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
227 widget,
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
228 gtk_label_new(ct->layout.label));
75
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
229
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
230 ui_reset_layout(ct->layout);
efe2f65bea17 added context menus (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 74
diff changeset
231 ct->current = widget;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
232 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
233
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
234
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
235
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
236 static GtkWidget* box_set_margin(GtkWidget *box, int margin) {
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
237 GtkWidget *ret = box;
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
238 #ifdef UI_GTK3
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
239 #if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 12
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
240 gtk_widget_set_margin_start(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
241 gtk_widget_set_margin_end(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
242 #else
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
243 gtk_widget_set_margin_left(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
244 gtk_widget_set_margin_right(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
245 #endif
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
246 gtk_widget_set_margin_top(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
247 gtk_widget_set_margin_bottom(box, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
248 #elif defined(UI_GTK2)
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
249 GtkWidget *a = gtk_alignment_new(0.5, 0.5, 1, 1);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
250 gtk_alignment_set_padding(GTK_ALIGNMENT(a), margin, margin, margin, margin);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
251 gtk_container_add(GTK_CONTAINER(a), box);
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
252 ret = a;
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
253 #endif
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
254 return ret;
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
255 }
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
256
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
257 UIWIDGET ui_box_create(UiObject *obj, UiContainerArgs args, UiSubContainerType type) {
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
258 UiObject *current = uic_current_obj(obj);
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
259 UiContainer *ct = current->container;
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
260 UI_APPLY_LAYOUT1(current, args);
62
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
261
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
262 GtkWidget *vbox = ui_gtk_vbox_new(args.spacing);
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
263 GtkWidget *widget = args.margin > 0 ? box_set_margin(vbox, args.margin) : vbox;
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
264 ct->add(ct, widget, TRUE);
62
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
265
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
266 UiObject *newobj = uic_object_new(obj, vbox);
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
267 newobj->container = ui_box_container(obj, vbox);
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
268 uic_obj_add(obj, newobj);
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
269
107
9aff1dc3990d improved box container and added radio button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 100
diff changeset
270 return widget;
62
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
271 }
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
272
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
273 UIEXPORT UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs args) {
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
274 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
275 }
70d2aee84432 added grid container (Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
276
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
277 UIEXPORT UIWIDGET ui_hbox_create(UiObject *obj, UiContainerArgs args) {
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
278 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
279 }
d51e334c1439 added checkbox and labels with alignment (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
280
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
281
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
282
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
283 UIWIDGET ui_grid_create(UiObject *obj, UiContainerArgs args) {
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
284 UiContainer *ct = uic_get_current_container(obj);
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
285 GtkWidget *widget;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
286
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
287 #ifdef UI_GTK3
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
288 GtkWidget *grid = gtk_grid_new();
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
289 gtk_grid_set_column_spacing(GTK_GRID(grid), args.columnspacing);
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
290 gtk_grid_set_row_spacing(GTK_GRID(grid), args.rowspacing);
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
291 #if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 12
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
292 gtk_widget_set_margin_start(grid, args.margin);
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
293 gtk_widget_set_margin_end(grid, args.margin);
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
294 #else
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
295 gtk_widget_set_margin_left(grid, margin);
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
296 gtk_widget_set_margin_right(grid, margin);
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
297 #endif
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
298 gtk_widget_set_margin_top(grid, args.margin);
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
299 gtk_widget_set_margin_bottom(grid, args.margin);
94
d51e334c1439 added checkbox and labels with alignment (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
300
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
301 widget = grid;
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
302 #elif defined(UI_GTK2)
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
303 GtkWidget *grid = gtk_table_new(1, 1, FALSE);
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
304
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
305 gtk_table_set_col_spacings(GTK_TABLE(grid), columnspacing);
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
306 gtk_table_set_row_spacings(GTK_TABLE(grid), rowspacing);
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
307
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
308 if(margin > 0) {
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
309 GtkWidget *a = gtk_alignment_new(0.5, 0.5, 1, 1);
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
310 gtk_alignment_set_padding(GTK_ALIGNMENT(a), margin, margin, margin, margin);
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
311 gtk_container_add(GTK_CONTAINER(a), grid);
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
312 widget = a;
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
313 } else {
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
314 widget = grid;
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
315 }
74
55718d4ed227 fixed grid container when using gtk2
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 66
diff changeset
316 #endif
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
317 ct->add(ct, widget, TRUE);
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
318
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
319 UiObject *newobj = uic_object_new(obj, grid);
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
320 newobj->container = ui_grid_container(obj, grid);
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
321 uic_obj_add(obj, newobj);
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
322
100
d276306d801f improved gtk2 implementation of grid container
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 99
diff changeset
323 return widget;
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
324 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
325
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
326
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
327 void ui_select_tab(UIWIDGET tabview, int tab) {
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
328 gtk_notebook_set_current_page(GTK_NOTEBOOK(tabview), tab);
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
329 }
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
330
165
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
331 /* -------------------- Splitpane -------------------- */
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
332
165
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
333 static GtkWidget* create_paned(UiOrientation orientation) {
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
334 #ifdef UI_GTK3
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
335 switch(orientation) {
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
336 case UI_HORIZONTAL: return gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
337 case UI_VERTICAL: return gtk_paned_new(GTK_ORIENTATION_VERTICAL);
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
338 }
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
339 #else
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
340 switch(orientation) {
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
341 case UI_HORIZONTAL: return gtk_hpaned_new();
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
342 case UI_VERTICAL: return gtk_vpaned_new();
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
343 }
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
344 #endif
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
345 return NULL;
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
346 }
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
347
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
348
3f32db79a76e add splitpane (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
349
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
350
59
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
351
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
352
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
353 /*
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
354 * -------------------- Layout Functions --------------------
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
355 *
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
356 * functions for setting layout attributes for the current container
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
357 *
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
358 */
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
359
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
360 void ui_layout_fill(UiObject *obj, UiBool fill) {
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
361 UiContainer *ct = uic_get_current_container(obj);
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
362 ct->layout.fill = ui_bool2lb(fill);
eb6611be50c7 added box container (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 52
diff changeset
363 }
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
364
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
365 void ui_layout_hexpand(UiObject *obj, UiBool expand) {
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
366 UiContainer *ct = uic_get_current_container(obj);
111
40dbf1a7526a added close handler to UiContext (GTK, Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 110
diff changeset
367 ct->layout.hexpand = expand;
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
368 }
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
369
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
370 void ui_layout_vexpand(UiObject *obj, UiBool expand) {
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
371 UiContainer *ct = uic_get_current_container(obj);
111
40dbf1a7526a added close handler to UiContext (GTK, Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 110
diff changeset
372 ct->layout.vexpand = expand;
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
373 }
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
374
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
375 void ui_layout_colspan(UiObject* obj, int cols) {
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
376 UiContainer* ct = uic_get_current_container(obj);
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
377 ct->layout.colspan = cols;
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
378 }
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
379
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
380 void ui_layout_rowspan(UiObject* obj, int rows) {
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
381 UiContainer* ct = uic_get_current_container(obj);
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
382 ct->layout.rowspan = rows;
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
383 }
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
384
65
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
385 void ui_newline(UiObject *obj) {
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
386 UiContainer *ct = uic_get_current_container(obj);
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
387 ct->layout.newline = TRUE;
4697592e24ba added label, grid container, simple tabview and textfield (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 62
diff changeset
388 }
99
ea1a2d5de765 improved grid container (Gtk)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 94
diff changeset
389

mercurial