Changes in uspace/lib/ui/src/resource.c [3c54869:52214a2] in mainline
- File:
-
- 1 edited
-
uspace/lib/ui/src/resource.c (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ui/src/resource.c
r3c54869 r52214a2 1 1 /* 2 * Copyright (c) 202 3Jiri Svoboda2 * Copyright (c) 2022 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;65 64 gfx_color_t *btn_text_color = NULL; 66 65 gfx_color_t *btn_highlight_color = NULL; … … 115 114 goto error; 116 115 117 rc = gfx_color_new_rgb_i16(0xe8e8, 0xe8e8, 0xe8e8, &btn_face_lit_color);118 if (rc != EOK)119 goto error;120 121 116 rc = gfx_color_new_rgb_i16(0, 0, 0, &btn_text_color); 122 117 if (rc != EOK) … … 232 227 resource->btn_frame_color = btn_frame_color; 233 228 resource->btn_face_color = btn_face_color; 234 resource->btn_face_lit_color = btn_face_lit_color;235 229 resource->btn_text_color = btn_text_color; 236 230 resource->btn_highlight_color = btn_highlight_color; … … 269 263 if (btn_face_color != NULL) 270 264 gfx_color_delete(btn_face_color); 271 if (btn_face_lit_color != NULL)272 gfx_color_delete(btn_face_lit_color);273 265 if (btn_text_color != NULL) 274 266 gfx_color_delete(btn_text_color); … … 344 336 gfx_color_t *btn_frame_color = NULL; 345 337 gfx_color_t *btn_face_color = NULL; 346 gfx_color_t *btn_face_lit_color = NULL;347 338 gfx_color_t *btn_text_color = NULL; 348 339 gfx_color_t *btn_highlight_color = NULL; … … 392 383 goto error; 393 384 394 rc = gfx_color_new_ega(0x30, &btn_face_lit_color);395 if (rc != EOK)396 goto error;397 398 385 rc = gfx_color_new_ega(0x20, &btn_text_color); 399 386 if (rc != EOK) … … 499 486 resource->btn_frame_color = btn_frame_color; 500 487 resource->btn_face_color = btn_face_color; 501 resource->btn_face_lit_color = btn_face_lit_color;502 488 resource->btn_text_color = btn_text_color; 503 489 resource->btn_highlight_color = btn_highlight_color; … … 536 522 if (btn_face_color != NULL) 537 523 gfx_color_delete(btn_face_color); 538 if (btn_face_lit_color != NULL)539 gfx_color_delete(btn_face_lit_color);540 524 if (btn_text_color != NULL) 541 525 gfx_color_delete(btn_text_color); … … 623 607 gfx_color_delete(resource->btn_frame_color); 624 608 gfx_color_delete(resource->btn_face_color); 625 gfx_color_delete(resource->btn_face_lit_color);626 609 gfx_color_delete(resource->btn_text_color); 627 610 gfx_color_delete(resource->btn_highlight_color); … … 694 677 } 695 678 696 /** Determine if resource is textmode.697 *698 * @param resource UI resource699 * @return @c true iff resource is textmode700 */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 resource709 * @return UI window face color710 */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 resource719 * @return UI window text color720 */721 gfx_color_t *ui_resource_get_wnd_text_color(ui_resource_t *resource)722 {723 return resource->wnd_text_color;724 }725 726 679 /** @} 727 680 */
Note:
See TracChangeset
for help on using the changeset viewer.
