Fri, 12 Dec 2025 12:44:03 +0100
fix uic_store_app_properties
|
665
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | * Copyright 2025 Olaf Wintermann. All rights reserved. |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
73689d24080c
add missing include
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 |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include "container.h" |
|
815
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
30 | #include "grid.h" |
|
665
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | |
|
814
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
32 | #include "../common/context.h" |
|
815
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
33 | #include "../common/container.h" |
|
841
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
34 | #include "../motif/container.h" |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
35 | |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
36 | |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
37 | static W32WidgetClass grid_layout_widget_class = { |
|
891
0804fc9298f6
fix grid background painting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
880
diff
changeset
|
38 | .eventproc = ui_grid_widget_event, |
|
841
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
39 | .enable = NULL, |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
40 | .show = w32_widget_default_show, |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
41 | .get_preferred_size = ui_grid_layout_get_preferred_size, |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
42 | .destroy = w32_widget_default_destroy |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
43 | }; |
|
814
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
44 | |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
45 | UiContainerPrivate* ui_obj_container(UiObject *obj) { |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
46 | return (UiContainerPrivate*)obj->container_end; |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
47 | } |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
48 | |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
49 | HWND ui_container_get_parent(UiContainerPrivate *ctn) { |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
50 | return ctn->parent ? ctn->parent(ctn) : ctn->hwnd; |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
51 | } |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
52 | |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
53 | void ui_container_add(UiContainerPrivate *ctn, W32Widget *widget, UiLayout *layout) { |
|
815
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
54 | UiLayout layout2 = *layout; |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
55 | if (layout2.margin > 0) { |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
56 | layout2.margin_left = layout2.margin; |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
57 | layout2.margin_right = layout2.margin; |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
58 | layout2.margin_top = layout2.margin; |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
59 | layout2.margin_bottom = layout2.margin; |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
60 | } |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
61 | ctn->add(ctn, widget, &layout2); |
|
814
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
62 | ctn->container.newline = FALSE; |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
63 | } |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
64 | |
|
938
be4c88ded783
change w32 eventproc signature + fix grid repaint bug (Win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
891
diff
changeset
|
65 | int ui_grid_widget_event(W32Widget *widget, HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { |
|
be4c88ded783
change w32 eventproc signature + fix grid repaint bug (Win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
891
diff
changeset
|
66 | if (uMsg == WM_ERASEBKGND) { |
|
be4c88ded783
change w32 eventproc signature + fix grid repaint bug (Win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
891
diff
changeset
|
67 | HDC hdc = (HDC)wParam; |
|
be4c88ded783
change w32 eventproc signature + fix grid repaint bug (Win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
891
diff
changeset
|
68 | UiGridWidget *grid = (UiGridWidget*)widget; |
|
be4c88ded783
change w32 eventproc signature + fix grid repaint bug (Win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
891
diff
changeset
|
69 | RECT rc; |
|
be4c88ded783
change w32 eventproc signature + fix grid repaint bug (Win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
891
diff
changeset
|
70 | GetClientRect(hwnd, &rc); |
|
be4c88ded783
change w32 eventproc signature + fix grid repaint bug (Win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
891
diff
changeset
|
71 | FillRect(hdc, &rc, grid->brush); |
|
be4c88ded783
change w32 eventproc signature + fix grid repaint bug (Win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
891
diff
changeset
|
72 | return 1; |
|
be4c88ded783
change w32 eventproc signature + fix grid repaint bug (Win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
891
diff
changeset
|
73 | } |
|
be4c88ded783
change w32 eventproc signature + fix grid repaint bug (Win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
891
diff
changeset
|
74 | return 0; |
|
891
0804fc9298f6
fix grid background painting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
880
diff
changeset
|
75 | } |
|
0804fc9298f6
fix grid background painting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
880
diff
changeset
|
76 | |
|
841
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
77 | W32Size ui_grid_layout_get_preferred_size(W32Widget *widget) { |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
78 | UiGridLayout *grid = widget->layoutmanager; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
79 | W32Size size; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
80 | size.width = grid->preferred_width; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
81 | size.height = grid->preferred_height; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
82 | return size; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
83 | } |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
84 | |
|
665
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | /* ---------------------------- Box Container ---------------------------- */ |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
88 | static UIWIDGET box_create(UiObject *obj, UiContainerArgs *args, UiBoxOrientation orientation) { |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
89 | return NULL; |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
90 | } |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
91 | |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
92 | // public |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
93 | UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs *args) { |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
94 | return box_create(obj, args, UI_BOX_VERTICAL); |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
95 | } |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
96 | |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
97 | // public |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
98 | UIWIDGET ui_hbox_create(UiObject *obj, UiContainerArgs *args) { |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
99 | return box_create(obj, args, UI_BOX_HORIZONTAL); |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
100 | } |
|
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
101 | |
|
818
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
102 | UiContainerX* ui_box_container_create(UiObject *obj, HWND hwnd, UiBoxOrientation orientation, short spacing, GridEdgeInsets padding) { |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
103 | UiBoxContainer *container = cxZalloc(obj->ctx->allocator, sizeof(UiBoxContainer)); |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
104 | container->container.hwnd = hwnd; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
105 | container->container.add = ui_box_container_add; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
106 | container->layout = ui_grid_layout_create(obj->ctx->allocator, spacing, spacing); |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
107 | container->layout->padding = padding; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
108 | container->orientation = orientation; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
109 | return (UiContainerX*)container; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
110 | } |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
111 | |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
112 | void ui_box_container_add(UiContainerPrivate *ctn, W32Widget *widget, UiLayout *layout) { |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
113 | UiBoxContainer *box = (UiBoxContainer*)ctn; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
114 | GridLayoutInfo gridLayout = (GridLayoutInfo) { |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
115 | .margin = (GridEdgeInsets) { layout->margin_top, layout->margin_bottom, layout->margin_left, layout->margin_right }, |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
116 | }; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
117 | if (box->orientation == UI_BOX_HORIZONTAL) { |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
118 | gridLayout.vexpand = TRUE; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
119 | gridLayout.vfill = TRUE; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
120 | gridLayout.hexpand = layout->fill; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
121 | gridLayout.hfill = layout->fill; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
122 | } else { |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
123 | gridLayout.hexpand = TRUE; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
124 | gridLayout.hfill = TRUE; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
125 | gridLayout.vexpand = layout->fill; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
126 | gridLayout.vfill = layout->fill; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
127 | } |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
128 | ui_grid_add_widget(box->layout, box->x, box->y, widget, &gridLayout); |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
129 | if (box->orientation == UI_BOX_HORIZONTAL) { |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
130 | box->x++; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
131 | } else { |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
132 | box->y++; |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
133 | } |
|
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
134 | } |
|
665
73689d24080c
add missing include
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
135 | |
|
814
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
136 | /* ---------------------------- Grid Container ---------------------------- */ |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
137 | |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
138 | UIWIDGET ui_grid_create(UiObject *obj, UiContainerArgs *args) { |
|
841
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
139 | HINSTANCE hInstance = GetModuleHandle(NULL); |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
140 | UiContainerPrivate *container = ui_obj_container(obj); |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
141 | HWND parent = ui_container_get_parent(container); |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
142 | UiLayout layout = UI_ARGS2LAYOUT(args); |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
143 | |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
144 | HWND hwnd = CreateWindowEx( |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
145 | 0, |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
146 | TEXT("STATIC"), |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
147 | NULL, |
|
844
3106d9ca2f9c
fix wrong child height in grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
841
diff
changeset
|
148 | WS_CHILD | WS_VISIBLE, |
|
891
0804fc9298f6
fix grid background painting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
880
diff
changeset
|
149 | 0, 0, 300, 300, |
|
841
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
150 | parent, |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
151 | NULL, |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
152 | hInstance, |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
153 | NULL); |
|
880
9c99ff36513f
add container event proc (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
844
diff
changeset
|
154 | SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)ui_default_eventproc); |
|
841
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
155 | |
|
891
0804fc9298f6
fix grid background painting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
880
diff
changeset
|
156 | UiGridWidget *widget = w32_widget_create(&grid_layout_widget_class, hwnd, sizeof(UiGridWidget)); |
|
0804fc9298f6
fix grid background painting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
880
diff
changeset
|
157 | ui_container_add(container, (W32Widget*)widget, &layout); |
|
841
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
158 | |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
159 | UiContainerX *gridContainer = ui_grid_container_create(obj, hwnd, args->columnspacing, args->rowspacing, INSETS_ZERO); |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
160 | uic_object_push_container(obj, gridContainer); |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
161 | |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
162 | UiGridLayoutContainer *grid = (UiGridLayoutContainer*)gridContainer; |
|
891
0804fc9298f6
fix grid background painting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
880
diff
changeset
|
163 | widget->widget.layout = (W32LayoutFunc)ui_grid_layout; |
|
0804fc9298f6
fix grid background painting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
880
diff
changeset
|
164 | widget->widget.layoutmanager = grid->layout; |
|
0804fc9298f6
fix grid background painting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
880
diff
changeset
|
165 | widget->brush = GetSysColorBrush(COLOR_BTNFACE); |
|
841
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
166 | grid->layout->preferred_width = 200; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
167 | grid->layout->preferred_height = 200; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
168 | |
|
891
0804fc9298f6
fix grid background painting
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
880
diff
changeset
|
169 | return (W32Widget*)widget; |
|
814
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
170 | } |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
171 | |
|
815
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
172 | UiContainerX* ui_grid_container_create(UiObject *obj, HWND hwnd, short columnspacing, short rowspacing, GridEdgeInsets padding) { |
|
814
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
173 | UiGridLayoutContainer *container = cxZalloc(obj->ctx->allocator, sizeof(UiGridLayoutContainer)); |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
174 | container->container.hwnd = hwnd; |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
175 | container->container.add = ui_grid_container_add; |
|
818
8185cd761897
implement box container (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
815
diff
changeset
|
176 | container->layout = ui_grid_layout_create(obj->ctx->allocator, columnspacing, rowspacing); |
|
815
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
177 | container->layout->padding = padding; |
|
814
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
178 | return (UiContainerX*)container; |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
179 | } |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
180 | |
|
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
181 | void ui_grid_container_add(UiContainerPrivate *ctn, W32Widget *widget, UiLayout *layout) { |
|
815
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
182 | UiGridLayoutContainer *grid = (UiGridLayoutContainer*)ctn; |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
183 | if (ctn->container.newline) { |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
184 | grid->y++; |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
185 | grid->x = 0; |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
186 | } |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
187 | |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
188 | uic_layout_setup_expand_fill(layout, grid->def_hexpand, grid->def_vexpand, grid->def_hfill, grid->def_vfill); |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
189 | GridLayoutInfo gridLayout = (GridLayoutInfo) { |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
190 | .margin = (GridEdgeInsets) { layout->margin_top, layout->margin_bottom, layout->margin_left, layout->margin_right }, |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
191 | .colspan = layout->colspan, |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
192 | .rowspan = layout->rowspan, |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
193 | .hexpand = layout->hexpand, |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
194 | .vexpand = layout->vexpand, |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
195 | .hfill = layout->hfill, |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
196 | .vfill = layout->vfill, |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
197 | }; |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
198 | ui_grid_add_widget(grid->layout, grid->x, grid->y, widget, &gridLayout); |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
199 | |
|
7ddf5fb7ec2a
implement grid layout (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
814
diff
changeset
|
200 | grid->x++; |
|
814
bcb3c7d486f3
add container base (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
201 | } |
|
841
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
202 | |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
203 | |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
204 | /* ---------------------------- Container Helper ---------------------------- */ |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
205 | |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
206 | void ui_container_begin_close(UiObject *obj) { |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
207 | UiContainerX *ct = obj->container_end; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
208 | ct->close = 1; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
209 | } |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
210 | |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
211 | int ui_container_finish(UiObject *obj) { |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
212 | UiContainerX *ct = obj->container_end; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
213 | if(ct->close) { |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
214 | ui_end_new(obj); |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
215 | return 0; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
216 | } |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
217 | return 1; |
|
651cf2c59dd9
implement ui_grid_create (win32)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
818
diff
changeset
|
218 | } |