Changes in uspace/lib/ui/src/resource.c [52214a2:3c54869] in mainline
- File:
-
- 1 edited
-
uspace/lib/ui/src/resource.c (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ui/src/resource.c
r52214a2 r3c54869 1 1 /* 2 * Copyright (c) 202 2Jiri Svoboda2 * Copyright (c) 2023 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 62 62 gfx_color_t *btn_frame_color = NULL; 63 63 gfx_color_t *btn_face_color = NULL; 64 gfx_color_t *btn_face_lit_color = NULL; 64 65 gfx_color_t *btn_text_color = NULL; 65 66 gfx_color_t *btn_highlight_color = NULL; … … 114 115 goto error; 115 116 117 rc = gfx_color_new_rgb_i16(0xe8e8, 0xe8e8, 0xe8e8, &btn_face_lit_color); 118 if (rc != EOK) 119 goto error; 120 116 121 rc = gfx_color_new_rgb_i16(0, 0, 0, &btn_text_color); 117 122 if (rc != EOK) … … 227 232 resource->btn_frame_color = btn_frame_color; 228 233 resource->btn_face_color = btn_face_color; 234 resource->btn_face_lit_color = btn_face_lit_color; 229 235 resource->btn_text_color = btn_text_color; 230 236 resource->btn_highlight_color = btn_highlight_color; … … 263 269 if (btn_face_color != NULL) 264 270 gfx_color_delete(btn_face_color); 271 if (btn_face_lit_color != NULL) 272 gfx_color_delete(btn_face_lit_color); 265 273 if (btn_text_color != NULL) 266 274 gfx_color_delete(btn_text_color); … … 336 344 gfx_color_t *btn_frame_color = NULL; 337 345 gfx_color_t *btn_face_color = NULL; 346 gfx_color_t *btn_face_lit_color = NULL; 338 347 gfx_color_t *btn_text_color = NULL; 339 348 gfx_color_t *btn_highlight_color = NULL; … … 383 392 goto error; 384 393 394 rc = gfx_color_new_ega(0x30, &btn_face_lit_color); 395 if (rc != EOK) 396 goto error; 397 385 398 rc = gfx_color_new_ega(0x20, &btn_text_color); 386 399 if (rc != EOK) … … 486 499 resource->btn_frame_color = btn_frame_color; 487 500 resource->btn_face_color = btn_face_color; 501 resource->btn_face_lit_color = btn_face_lit_color; 488 502 resource->btn_text_color = btn_text_color; 489 503 resource->btn_highlight_color = btn_highlight_color; … … 522 536 if (btn_face_color != NULL) 523 537 gfx_color_delete(btn_face_color); 538 if (btn_face_lit_color != NULL) 539 gfx_color_delete(btn_face_lit_color); 524 540 if (btn_text_color != NULL) 525 541 gfx_color_delete(btn_text_color); … … 607 623 gfx_color_delete(resource->btn_frame_color); 608 624 gfx_color_delete(resource->btn_face_color); 625 gfx_color_delete(resource->btn_face_lit_color); 609 626 gfx_color_delete(resource->btn_text_color); 610 627 gfx_color_delete(resource->btn_highlight_color); … … 677 694 } 678 695 696 /** Determine if resource is textmode. 697 * 698 * @param resource UI resource 699 * @return @c true iff resource is textmode 700 */ 701 bool ui_resource_is_textmode(ui_resource_t *resource) 702 { 703 return resource->textmode; 704 } 705 706 /** Get the UI window face color. 707 * 708 * @param resource UI resource 709 * @return UI window face color 710 */ 711 gfx_color_t *ui_resource_get_wnd_face_color(ui_resource_t *resource) 712 { 713 return resource->wnd_face_color; 714 } 715 716 /** Get the UI window text color. 717 * 718 * @param resource UI resource 719 * @return UI window text color 720 */ 721 gfx_color_t *ui_resource_get_wnd_text_color(ui_resource_t *resource) 722 { 723 return resource->wnd_text_color; 724 } 725 679 726 /** @} 680 727 */
Note:
See TracChangeset
for help on using the changeset viewer.
