Subversion Repositories Kolibri OS

Rev

Rev 5231 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5231 Rev 5238
Line 55... Line 55...
55 
            (from->y == to->y)          &&
 55 
            (from->y == to->y)          &&
56 
            (from->width == to->width)  &&
 56 
            (from->width == to->width)  &&
57 
            (from->height == to->height);
 57 
            (from->height == to->height);
58 
}
 58 
}
Line 59... Line 59...
59 
 
 59 
 
60 
void rect_draw_text(rect *r, char *txt, __u32 len, __u32 color)
 60 
void rect_draw_text(rect *r, char *txt, __u32 len, __u32 color, __u32 frame_color)
- 
 
 61 
{
61 
{
 62 
    // right down shadow
62 
    __menuet__write_text(r->x + 1 + (r->width - len * FONT_WIDTH - len) / 2,
 63 
    __menuet__write_text(r->x + 1 + (r->width - text_length_px(len)) / 2,
63 
                         r->y + 1 + (r->height - FONT_HEIGHT) / 2,
 64 
                         r->y + 1 + (r->height - FONT_HEIGHT) / 2,
64 
                         0xFFFFFF,txt,len);
 - 
 
65 
    __menuet__write_text(r->x - 1 + (r->width - len * FONT_WIDTH - len) / 2,
 - 
 
66 
                         r->y - 1 + (r->height - FONT_HEIGHT) / 2,
 - 
 
67 
                         0xFFFFFF,txt,len);
 - 
 
68 
    __menuet__write_text(r->x - 1 + (r->width - len * FONT_WIDTH - len) / 2,
 - 
 
69 
                         r->y + 1 + (r->height - FONT_HEIGHT) / 2,
 - 
 
70 
                         0xFFFFFF,txt,len);
 - 
 
71 
    __menuet__write_text(r->x + 1 + (r->width - len * FONT_WIDTH - len) / 2,
 - 
 
72 
                         r->y - 1 + (r->height - FONT_HEIGHT) / 2,
 65 
                         frame_color,txt,len);
73 
                         0xFFFFFF,txt,len);
 - 
 
74 
 
 66 
    // right shadow
75 
    __menuet__write_text(r->x + 1 + (r->width - len * FONT_WIDTH - len) / 2,
 - 
 
76 
                         r->y + (r->height - FONT_HEIGHT) / 2,
 - 
 
77 
                         0xFFFFFF,txt,len);
 - 
 
78 
    __menuet__write_text(r->x - 1 + (r->width - len * FONT_WIDTH - len) / 2,
 67 
    __menuet__write_text(r->x + 1 + (r->width - text_length_px(len)) / 2,
79 
                         r->y + (r->height - FONT_HEIGHT) / 2,
 68 
                         r->y + (r->height - FONT_HEIGHT) / 2,
- 
 
 69 
                         frame_color,txt,len);
80 
                         0xFFFFFF,txt,len);
 70 
    // down shadow
81 
    __menuet__write_text(r->x + (r->width - len * FONT_WIDTH - len) / 2,
 71 
    __menuet__write_text(r->x + (r->width - text_length_px(len)) / 2,
82 
                         r->y + 1 + (r->height - FONT_HEIGHT) / 2,
 72 
                         r->y + 1 + (r->height - FONT_HEIGHT) / 2,
83 
                         0xFFFFFF,txt,len);
 - 
 
84 
    __menuet__write_text(r->x + (r->width - len * FONT_WIDTH - len) / 2,
 - 
 
85 
                         r->y - 1 + (r->height - FONT_HEIGHT) / 2,
 - 
 
Line 86... Line 73...
86 
                         0xFFFFFF,txt,len);
 73 
                         frame_color,txt,len);
87 
 
 74 
 
88 
    __menuet__write_text(r->x + (r->width - len * FONT_WIDTH - len) / 2,
 75 
    __menuet__write_text(r->x + (r->width - text_length_px(len)) / 2,
89 
                         r->y + (r->height - FONT_HEIGHT) / 2,
 76 
                         r->y + (r->height - FONT_HEIGHT) / 2,
Line 90... Line 77...
90 
                         0,txt,len);
 77 
                         color,txt,len);
91 
}
 78 
}
92 
 
 79 
 
93 
void rect_draw_value(rect* r, __u32 v, __u32 color)
 80 
void rect_draw_value(rect* r, __u32 v, __u32 color, __u32 frame_color)
94 
{
 81 
{
95 
    char buffer[16] = {0};
 82 
    char buffer[16] = {0};