Changeset bd16113 in mainline for uspace/lib/ui/src/resource.c
- Timestamp:
- 2022-03-15T10:39:27Z (2 years ago)
- Branches:
- master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0eca788
- Parents:
- b3b48f4
- git-author:
- Jiri Svoboda <jiri@…> (2022-03-14 19:39:16)
- git-committer:
- Jiri Svoboda <jiri@…> (2022-03-15 10:39:27)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ui/src/resource.c
rb3b48f4 rbd16113 84 84 gfx_color_t *entry_sel_text_fg_color = NULL; 85 85 gfx_color_t *entry_sel_text_bg_color = NULL; 86 gfx_color_t *sbar_through_color = NULL; 86 87 errno_t rc; 87 88 … … 205 206 206 207 rc = gfx_color_new_rgb_i16(0, 0, 0xffff, &entry_sel_text_bg_color); 208 if (rc != EOK) 209 goto error; 210 211 rc = gfx_color_new_rgb_i16(0xe4e4, 0xe4e4, 0xe4e4, 212 &sbar_through_color); 207 213 if (rc != EOK) 208 214 goto error; … … 240 246 resource->entry_sel_text_fg_color = entry_sel_text_fg_color; 241 247 resource->entry_sel_text_bg_color = entry_sel_text_bg_color; 248 249 resource->sbar_through_color = sbar_through_color; 242 250 243 251 *rresource = resource; … … 295 303 if (entry_act_bg_color != NULL) 296 304 gfx_color_delete(entry_act_bg_color); 305 306 if (sbar_through_color != NULL) 307 gfx_color_delete(sbar_through_color); 297 308 298 309 if (tface != NULL) … … 338 349 gfx_color_t *entry_sel_text_bg_color = NULL; 339 350 gfx_color_t *entry_act_bg_color = NULL; 351 gfx_color_t *sbar_through_color = NULL; 340 352 errno_t rc; 341 353 … … 446 458 447 459 rc = gfx_color_new_ega(0x37, &entry_act_bg_color); 460 if (rc != EOK) 461 goto error; 462 463 rc = gfx_color_new_ega(0x07, &sbar_through_color); 448 464 if (rc != EOK) 449 465 goto error; … … 481 497 resource->entry_sel_text_fg_color = entry_sel_text_fg_color; 482 498 resource->entry_sel_text_bg_color = entry_sel_text_bg_color; 499 500 resource->sbar_through_color = sbar_through_color; 483 501 484 502 *rresource = resource; … … 536 554 if (entry_sel_text_bg_color != NULL) 537 555 gfx_color_delete(entry_sel_text_bg_color); 556 if (sbar_through_color != NULL) 557 gfx_color_delete(sbar_through_color); 538 558 539 559 if (tface != NULL) … … 594 614 gfx_color_delete(resource->entry_sel_text_bg_color); 595 615 616 gfx_color_delete(resource->sbar_through_color); 617 596 618 gfx_font_close(resource->font); 597 619 gfx_typeface_destroy(resource->tface);
Note:
See TracChangeset
for help on using the changeset viewer.