Changes in uspace/lib/ui/test/popup.c [c68c18b9:46a47c0] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ui/test/popup.c
rc68c18b9 r46a47c0 1 1 /* 2 * Copyright (c) 202 1Jiri Svoboda2 * Copyright (c) 2023 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 64 64 static errno_t test_ctl_paint(void *); 65 65 static ui_evclaim_t test_ctl_pos_event(void *, pos_event_t *); 66 static void test_ctl_unfocus(void * );66 static void test_ctl_unfocus(void *, unsigned); 67 67 68 68 static ui_control_ops_t test_ctl_ops = { … … 91 91 pos_event_t pos_event; 92 92 bool unfocus; 93 unsigned unfocus_nfocus; 93 94 } test_ctl_resp_t; 94 95 … … 98 99 errno_t rc; 99 100 ui_t *ui = NULL; 101 ui_wnd_params_t wparams; 102 ui_window_t *window = NULL; 100 103 ui_popup_params_t params; 101 104 ui_popup_t *popup = NULL; … … 104 107 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 105 108 109 ui_wnd_params_init(&wparams); 110 wparams.caption = "Hello"; 111 112 rc = ui_window_create(ui, &wparams, &window); 113 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 114 PCUT_ASSERT_NOT_NULL(window); 115 106 116 ui_popup_params_init(¶ms); 107 117 108 rc = ui_popup_create(ui, NULL, ¶ms, &popup);118 rc = ui_popup_create(ui, window, ¶ms, &popup); 109 119 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 110 120 PCUT_ASSERT_NOT_NULL(popup); 111 121 112 122 ui_popup_destroy(popup); 123 ui_window_destroy(window); 113 124 ui_destroy(ui); 114 125 } … … 125 136 errno_t rc; 126 137 ui_t *ui = NULL; 138 ui_wnd_params_t wparams; 139 ui_window_t *window = NULL; 127 140 ui_popup_params_t params; 128 141 ui_popup_t *popup = NULL; … … 133 146 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 134 147 148 ui_wnd_params_init(&wparams); 149 wparams.caption = "Hello"; 150 151 rc = ui_window_create(ui, &wparams, &window); 152 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 153 PCUT_ASSERT_NOT_NULL(window); 154 135 155 ui_popup_params_init(¶ms); 136 156 137 rc = ui_popup_create(ui, NULL, ¶ms, &popup);157 rc = ui_popup_create(ui, window, ¶ms, &popup); 138 158 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 139 159 PCUT_ASSERT_NOT_NULL(popup); … … 171 191 172 192 ui_popup_destroy(popup); 193 ui_window_destroy(window); 173 194 ui_destroy(ui); 174 195 } … … 179 200 errno_t rc; 180 201 ui_t *ui = NULL; 181 ui_wnd_params_t params;202 ui_wnd_params_t wparams; 182 203 ui_window_t *window = NULL; 204 ui_popup_params_t params; 205 ui_popup_t *popup = NULL; 183 206 ui_resource_t *res; 184 207 gfx_context_t *gc; 185 gfx_rect_t rect;186 208 187 209 rc = ui_create_disp(NULL, &ui); 188 210 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 189 211 190 ui_wnd_params_init(& params);191 params.caption = "Hello";192 193 rc = ui_window_create(ui, & params, &window);212 ui_wnd_params_init(&wparams); 213 wparams.caption = "Hello"; 214 215 rc = ui_window_create(ui, &wparams, &window); 194 216 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 195 217 PCUT_ASSERT_NOT_NULL(window); 196 218 197 res = ui_window_get_res(window); 219 ui_popup_params_init(¶ms); 220 221 rc = ui_popup_create(ui, window, ¶ms, &popup); 222 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 223 PCUT_ASSERT_NOT_NULL(popup); 224 225 res = ui_popup_get_res(popup); 198 226 PCUT_ASSERT_NOT_NULL(res); 199 227 200 gc = ui_ window_get_gc(window);228 gc = ui_popup_get_gc(popup); 201 229 PCUT_ASSERT_NOT_NULL(gc); 202 230 203 ui_window_get_app_rect(window, &rect); 204 231 ui_popup_destroy(popup); 205 232 ui_window_destroy(window); 206 233 ui_destroy(ui); … … 212 239 errno_t rc; 213 240 ui_t *ui = NULL; 241 ui_wnd_params_t wparams; 242 ui_window_t *window = NULL; 214 243 ui_popup_params_t params; 215 244 ui_popup_t *popup = NULL; … … 220 249 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 221 250 251 ui_wnd_params_init(&wparams); 252 wparams.caption = "Hello"; 253 254 rc = ui_window_create(ui, &wparams, &window); 255 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 256 PCUT_ASSERT_NOT_NULL(window); 257 222 258 ui_popup_params_init(¶ms); 223 259 224 rc = ui_popup_create(ui, NULL, ¶ms, &popup);260 rc = ui_popup_create(ui, window, ¶ms, &popup); 225 261 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 226 262 PCUT_ASSERT_NOT_NULL(popup); … … 251 287 252 288 ui_popup_destroy(popup); 289 ui_window_destroy(window); 253 290 ui_destroy(ui); 254 291 } … … 305 342 } 306 343 307 static void test_ctl_unfocus(void *arg )344 static void test_ctl_unfocus(void *arg, unsigned nfocus) 308 345 { 309 346 test_ctl_resp_t *resp = (test_ctl_resp_t *) arg; 310 347 311 348 resp->unfocus = true; 349 resp->unfocus_nfocus = nfocus; 312 350 } 313 351
Note:
See TracChangeset
for help on using the changeset viewer.