Changeset dc5c303 in mainline for uspace/lib/ui/src/resource.c


Ignore:
Timestamp:
2023-12-28T13:59:23Z (22 months ago)
Author:
GitHub <noreply@…>
Children:
6b66de6b
Parents:
42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)
git-committer:
GitHub <noreply@…> (2023-12-28 13:59:23)
Message:

Merge branch 'master' into topic/packet-capture

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/ui/src/resource.c

    r42c2e65 rdc5c303  
    6868        gfx_color_t *wnd_face_color = NULL;
    6969        gfx_color_t *wnd_text_color = NULL;
     70        gfx_color_t *wnd_dis_text_color = NULL;
    7071        gfx_color_t *wnd_text_hgl_color = NULL;
    7172        gfx_color_t *wnd_sel_text_color = NULL;
    … …  
    8586        gfx_color_t *entry_sel_text_fg_color = NULL;
    8687        gfx_color_t *entry_sel_text_bg_color = NULL;
    87         gfx_color_t *sbar_through_color = NULL;
    88         gfx_color_t *sbar_act_through_color = NULL;
     88        gfx_color_t *sbar_trough_color = NULL;
     89        gfx_color_t *sbar_act_trough_color = NULL;
    8990        errno_t rc;
    9091
    … …  
    140141                goto error;
    141142
     143        rc = gfx_color_new_rgb_i16(0x9696, 0x9696, 0x9696, &wnd_dis_text_color);
     144        if (rc != EOK)
     145                goto error;
     146
    142147        rc = gfx_color_new_rgb_i16(0, 0, 0, &wnd_text_hgl_color);
    143148        if (rc != EOK)
    … …  
    216221
    217222        rc = gfx_color_new_rgb_i16(0xe4e4, 0xe4e4, 0xe4e4,
    218             &sbar_through_color);
     223            &sbar_trough_color);
    219224        if (rc != EOK)
    220225                goto error;
    221226
    222227        rc = gfx_color_new_rgb_i16(0x5858, 0x5858, 0x5858,
    223             &sbar_act_through_color);
     228            &sbar_act_trough_color);
    224229        if (rc != EOK)
    225230                goto error;
    … …  
    239244        resource->wnd_face_color = wnd_face_color;
    240245        resource->wnd_text_color = wnd_text_color;
     246        resource->wnd_dis_text_color = wnd_dis_text_color;
    241247        resource->wnd_text_hgl_color = wnd_text_hgl_color;
    242248        resource->wnd_sel_text_color = wnd_sel_text_color;
    … …  
    259265        resource->entry_sel_text_bg_color = entry_sel_text_bg_color;
    260266
    261         resource->sbar_through_color = sbar_through_color;
    262         resource->sbar_act_through_color = sbar_act_through_color;
     267        resource->sbar_trough_color = sbar_trough_color;
     268        resource->sbar_act_trough_color = sbar_act_trough_color;
    263269
    264270        *rresource = resource;
    … …  
    282288        if (wnd_text_color != NULL)
    283289                gfx_color_delete(wnd_text_color);
     290        if (wnd_dis_text_color != NULL)
     291                gfx_color_delete(wnd_dis_text_color);
    284292        if (wnd_text_hgl_color != NULL)
    285293                gfx_color_delete(wnd_text_hgl_color);
    … …  
    319327                gfx_color_delete(entry_act_bg_color);
    320328
    321         if (sbar_through_color != NULL)
    322                 gfx_color_delete(sbar_through_color);
    323         if (sbar_act_through_color != NULL)
    324                 gfx_color_delete(sbar_act_through_color);
     329        if (sbar_trough_color != NULL)
     330                gfx_color_delete(sbar_trough_color);
     331        if (sbar_act_trough_color != NULL)
     332                gfx_color_delete(sbar_act_trough_color);
    325333
    326334        if (tface != NULL)
    … …  
    350358        gfx_color_t *wnd_face_color = NULL;
    351359        gfx_color_t *wnd_text_color = NULL;
     360        gfx_color_t *wnd_dis_text_color = NULL;
    352361        gfx_color_t *wnd_text_hgl_color = NULL;
    353362        gfx_color_t *wnd_sel_text_color = NULL;
    … …  
    367376        gfx_color_t *entry_sel_text_bg_color = NULL;
    368377        gfx_color_t *entry_act_bg_color = NULL;
    369         gfx_color_t *sbar_through_color = NULL;
    370         gfx_color_t *sbar_act_through_color = NULL;
     378        gfx_color_t *sbar_trough_color = NULL;
     379        gfx_color_t *sbar_act_trough_color = NULL;
    371380        errno_t rc;
    372381
    … …  
    416425                goto error;
    417426
     427        rc = gfx_color_new_ega(0x78, &wnd_dis_text_color);
     428        if (rc != EOK)
     429                goto error;
     430
    418431        rc = gfx_color_new_ega(0x74, &wnd_text_hgl_color);
    419432        if (rc != EOK)
    … …  
    484497                goto error;
    485498
    486         rc = gfx_color_new_ega(0x07, &sbar_through_color);
    487         if (rc != EOK)
    488                 goto error;
    489 
    490         rc = gfx_color_new_ega(0x07, &sbar_act_through_color);
     499        rc = gfx_color_new_ega(0x07, &sbar_trough_color);
     500        if (rc != EOK)
     501                goto error;
     502
     503        rc = gfx_color_new_ega(0x07, &sbar_act_trough_color);
    491504        if (rc != EOK)
    492505                goto error;
    … …  
    506519        resource->wnd_face_color = wnd_face_color;
    507520        resource->wnd_text_color = wnd_text_color;
     521        resource->wnd_dis_text_color = wnd_dis_text_color;
    508522        resource->wnd_text_hgl_color = wnd_text_hgl_color;
    509523        resource->wnd_sel_text_color = wnd_sel_text_color;
    … …  
    526540        resource->entry_sel_text_bg_color = entry_sel_text_bg_color;
    527541
    528         resource->sbar_through_color = sbar_through_color;
    529         resource->sbar_act_through_color = sbar_act_through_color;
     542        resource->sbar_trough_color = sbar_trough_color;
     543        resource->sbar_act_trough_color = sbar_act_trough_color;
    530544
    531545        *rresource = resource;
    … …  
    549563        if (wnd_text_color != NULL)
    550564                gfx_color_delete(wnd_text_color);
     565        if (wnd_dis_text_color != NULL)
     566                gfx_color_delete(wnd_dis_text_color);
    551567        if (wnd_text_hgl_color != NULL)
    552568                gfx_color_delete(wnd_text_hgl_color);
    … …  
    585601        if (entry_sel_text_bg_color != NULL)
    586602                gfx_color_delete(entry_sel_text_bg_color);
    587         if (sbar_through_color != NULL)
    588                 gfx_color_delete(sbar_through_color);
    589         if (sbar_act_through_color != NULL)
    590                 gfx_color_delete(sbar_act_through_color);
     603        if (sbar_trough_color != NULL)
     604                gfx_color_delete(sbar_trough_color);
     605        if (sbar_act_trough_color != NULL)
     606                gfx_color_delete(sbar_act_trough_color);
    591607
    592608        if (tface != NULL)
    … …  
    630646        gfx_color_delete(resource->wnd_face_color);
    631647        gfx_color_delete(resource->wnd_text_color);
     648        gfx_color_delete(resource->wnd_dis_text_color);
    632649        gfx_color_delete(resource->wnd_sel_text_color);
    633650        gfx_color_delete(resource->wnd_sel_text_bg_color);
    … …  
    648665        gfx_color_delete(resource->entry_sel_text_bg_color);
    649666
    650         gfx_color_delete(resource->sbar_through_color);
    651         gfx_color_delete(resource->sbar_act_through_color);
     667        gfx_color_delete(resource->sbar_trough_color);
     668        gfx_color_delete(resource->sbar_act_trough_color);
    652669
    653670        gfx_font_close(resource->font);
Note: See TracChangeset for help on using the changeset viewer.