| 1,11 → 1,27 |
|---|
| #ifndef KOLIBRI_FRAME_H |
| #define KOLIBRI_FRAME_H |
| |
| enum { |
| TOP, |
| BOTTON |
| enum fr_text_position_t { |
| FR_TOP, |
| FR_BOTTON |
| }; |
| |
| /* |
| ; FR_FLAGS = [x][yyy][z] |
| ; z - Caption |
| ; yyy - BorderStyle |
| ; x - BackStyle |
| */ |
| enum fr_flags_t { |
| FR_CAPTION = 1, // if text != null set auto |
| FR_DOUBLE = 0, // default |
| FR_RAISED = 2, |
| FR_SUNKEN = 4, |
| FR_ETCHED = 6, |
| FR_RINGED = 8, |
| FR_FILLED = 0x10 |
| }; |
| |
| typedef struct { |
| uint32_t type; |
| uint32_t x_w; |
| 12,7 → 28,7 |
|---|
| uint32_t y_h; |
| color_t ext_col; |
| color_t int_col; |
| uint32_t draw_text_flag; |
| uint32_t flags; |
| char *text_pointer; |
| uint32_t text_position; |
| uint32_t font_number; |
| 21,7 → 37,8 |
|---|
| color_t font_bg_color; |
| }frame; |
| |
| inline frame* kolibri_frame(frame* f, uint32_t x_w, uint32_t y_h, color_t ext_col, color_t int_col, char *text, uint32_t text_position, color_t font_color, color_t font_bgcolor) |
| inline frame* kolibri_frame(frame* f, uint32_t x_w, uint32_t y_h, color_t ext_col, color_t int_col, char *text, enum fr_text_position_t text_position, |
| color_t font_color, color_t font_bgcolor, enum fr_flags_t flags) |
| { |
| f->type = 0; |
| f->x_w = x_w; |
| 28,7 → 45,8 |
|---|
| f->y_h = y_h; |
| f->ext_col = ext_col; |
| f->int_col = int_col; |
| f->draw_text_flag = text != NULL; |
| f->flags = flags; |
| if (text) f->flags |= FR_CAPTION; |
| f->text_pointer = text; |
| f->text_position = text_position; |
| f->font_number = 0; // 0 == font 6x9, 1==8x16 |
| 36,23 → 54,25 |
|---|
| f->font_color = font_color | 0x80000000; |
| f->font_bg_color = font_bgcolor; |
| |
| |
| return f; |
| } |
| |
| inline frame* kolibri_new_frame(uint32_t x_w, uint32_t y_h, color_t ext_col, color_t int_col, char *text, uint32_t text_position, color_t font_color, color_t font_bgcolor) |
| inline frame* kolibri_new_frame(uint32_t x_w, uint32_t y_h, color_t ext_col, color_t int_col, char *text, enum fr_text_position_t text_position, |
| color_t font_color, color_t font_bgcolor, enum fr_flags_t flags) |
| { |
| frame *new_frame = (frame *)malloc(sizeof(frame)); |
| return kolibri_frame(new_frame, x_w, y_h, ext_col, int_col, text, text_position, font_color, font_bgcolor); |
| return kolibri_frame(new_frame, x_w, y_h, ext_col, int_col, text, text_position, font_color, font_bgcolor, flags); |
| } |
| |
| inline frame* kolibri_frame_def(frame* f, uint32_t x_w, uint32_t y_h, char *text) |
| { |
| return kolibri_frame(f, x_w, y_h, 0x00FCFCFC, 0x00DCDCDC, text, TOP, kolibri_color_table.color_work_text, kolibri_color_table.color_work_area); |
| return kolibri_frame(f, x_w, y_h, 0x00FCFCFC, 0x00DCDCDC, text, FR_TOP, kolibri_color_table.color_work_text, kolibri_color_table.color_work_area, 0); |
| } |
| |
| inline frame* kolibri_new_frame_def(uint32_t x_w, uint32_t y_h, char *text) |
| { |
| return kolibri_new_frame(x_w, y_h, 0x00FCFCFC, 0x00DCDCDC, text, TOP, kolibri_color_table.color_work_text, kolibri_color_table.color_work_area); |
| return kolibri_new_frame(x_w, y_h, 0x00FCFCFC, 0x00DCDCDC, text, FR_TOP, kolibri_color_table.color_work_text, kolibri_color_table.color_work_area, 0); |
| } |
| |
| inline void gui_add_frame(kolibri_window *wnd, frame* f) |