Changeset 1026cc4 in mainline for uspace/lib/ui/src/resource.c
- Timestamp:
- 2022-03-20T19:51:09Z (2 years ago)
- Branches:
- master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 26c90dd
- Parents:
- 5ef85c0
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ui/src/resource.c
r5ef85c0 r1026cc4 85 85 gfx_color_t *entry_sel_text_bg_color = NULL; 86 86 gfx_color_t *sbar_through_color = NULL; 87 gfx_color_t *sbar_act_through_color = NULL; 87 88 errno_t rc; 88 89 … … 211 212 rc = gfx_color_new_rgb_i16(0xe4e4, 0xe4e4, 0xe4e4, 212 213 &sbar_through_color); 214 if (rc != EOK) 215 goto error; 216 217 rc = gfx_color_new_rgb_i16(0x5858, 0x5858, 0x5858, 218 &sbar_act_through_color); 213 219 if (rc != EOK) 214 220 goto error; … … 248 254 249 255 resource->sbar_through_color = sbar_through_color; 256 resource->sbar_act_through_color = sbar_act_through_color; 250 257 251 258 *rresource = resource; … … 306 313 if (sbar_through_color != NULL) 307 314 gfx_color_delete(sbar_through_color); 315 if (sbar_act_through_color != NULL) 316 gfx_color_delete(sbar_act_through_color); 308 317 309 318 if (tface != NULL) … … 350 359 gfx_color_t *entry_act_bg_color = NULL; 351 360 gfx_color_t *sbar_through_color = NULL; 361 gfx_color_t *sbar_act_through_color = NULL; 352 362 errno_t rc; 353 363 … … 462 472 463 473 rc = gfx_color_new_ega(0x07, &sbar_through_color); 474 if (rc != EOK) 475 goto error; 476 477 rc = gfx_color_new_ega(0x07, &sbar_act_through_color); 464 478 if (rc != EOK) 465 479 goto error; … … 499 513 500 514 resource->sbar_through_color = sbar_through_color; 515 resource->sbar_act_through_color = sbar_act_through_color; 501 516 502 517 *rresource = resource; … … 556 571 if (sbar_through_color != NULL) 557 572 gfx_color_delete(sbar_through_color); 573 if (sbar_act_through_color != NULL) 574 gfx_color_delete(sbar_act_through_color); 558 575 559 576 if (tface != NULL) … … 615 632 616 633 gfx_color_delete(resource->sbar_through_color); 634 gfx_color_delete(resource->sbar_act_through_color); 617 635 618 636 gfx_font_close(resource->font);
Note:
See TracChangeset
for help on using the changeset viewer.