Changeset 117


Ignore:
Timestamp:
04/15/07 10:17:22 (7 years ago)
Author:
GrAnd
Message:

+ Ajustable colors of histo border and markers

Location:
branches/grand
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/grand/core/conf.c

    r116 r117  
    105105    CONF_INFO( 46, conf.reader_codepage,        CONF_DEF_VALUE, i:FONT_CP_WIN, NULL), 
    106106    CONF_INFO( 47, conf.splash_show,            CONF_DEF_VALUE, i:1, NULL), 
     107    CONF_INFO( 48, conf.histo_color2,           CONF_DEF_VALUE, cl:MAKE_COLOR(COLOR_RED, COLOR_WHITE), NULL), 
    107108}; 
    108109#define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0])) 
  • branches/grand/core/gui.c

    r116 r117  
    161161    {"Histogram",                   MENUITEM_COLOR_FG,  (int*)&conf.histo_color }, 
    162162    {"Histogram background",        MENUITEM_COLOR_BG,  (int*)&conf.histo_color }, 
     163    {"Histogram border",            MENUITEM_COLOR_FG,  (int*)&conf.histo_color2 }, 
     164    {"Histogram EXP markers",       MENUITEM_COLOR_BG,  (int*)&conf.histo_color2 }, 
    163165    {"Battery icon",                MENUITEM_COLOR_FG,  (int*)&conf.batt_icon_color }, 
    164166    {"Menu text",                   MENUITEM_COLOR_FG,  (int*)&conf.menu_color }, 
  • branches/grand/core/gui_osd.c

    r109 r117  
    134134            for (v=1; v<h-1; ++v) 
    135135                draw_pixel(x+1+i, y+h-v, (v<=threshold)?cl:cl_bg); 
    136             cl_over = (threshold==h && conf.show_overexp)?COLOR_RED:cl; 
     136            cl_over = (threshold==h && conf.show_overexp)?conf.histo_color2>>8:cl; 
    137137            for (; v<h; ++v) 
    138138                draw_pixel(x+1+i, y+h-v, (v<=threshold)?cl_over:cl_bg); 
     
    144144            for (v=1; v<h-3; ++v) 
    145145                draw_pixel(x+1+i, y+h-v, (v<=threshold)?cl:cl_bg); 
    146             cl_over = (threshold==h && conf.show_overexp)?COLOR_RED:cl; 
     146            cl_over = (threshold==h && conf.show_overexp)?conf.histo_color2>>8:cl; 
    147147            for (; v<h; ++v) 
    148148                draw_pixel(x+1+i, y+h-v, (v<=threshold)?cl_over:cl_bg); 
     
    150150    } 
    151151       
    152     draw_rect(x, y, x+1+w, y+h, COLOR_WHITE); 
     152    draw_rect(x, y, x+1+w, y+h, conf.histo_color2&0xFF); 
    153153 
    154154} 
     
    203203    if (conf.histo_layout != OSD_HISTO_LAYOUT_R_G_B) { 
    204204        if (under_exposed && conf.show_overexp) { 
    205             draw_filled_ellipse(conf.histo_pos.x+5, conf.histo_pos.y+5, 3, 3, MAKE_COLOR(COLOR_RED, COLOR_RED)); 
     205            draw_filled_ellipse(conf.histo_pos.x+5, conf.histo_pos.y+5, 3, 3, MAKE_COLOR(conf.histo_color2>>8, conf.histo_color2>>8)); 
    206206        } 
    207207 
    208208        if (over_exposed && conf.show_overexp) { 
    209             draw_filled_ellipse(conf.histo_pos.x+HISTO_WIDTH-5, conf.histo_pos.y+5, 3, 3, MAKE_COLOR(COLOR_RED, COLOR_RED)); 
     209            draw_filled_ellipse(conf.histo_pos.x+HISTO_WIDTH-5, conf.histo_pos.y+5, 3, 3, MAKE_COLOR(conf.histo_color2>>8, conf.histo_color2>>8)); 
    210210        } 
    211211    } 
  • branches/grand/include/conf.h

    r116 r117  
    4848 
    4949    color histo_color; 
     50    color histo_color2; // markers/border 
    5051    color osd_color; 
    5152    color batt_icon_color; 
Note: See TracChangeset for help on using the changeset viewer.