← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/space_info/info_draw.c

  • Committer: Reinhard Tartler
  • Date: 2014-05-31 01:50:05 UTC
  • mfrom: (14.2.27 sid)
  • Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/space_info/info_draw.c
67
67
 
68
68
static void info_report_color(unsigned char *fg, unsigned char *bg, Report *report, const short do_tint)
69
69
{
 
70
        int bg_id = TH_BACK, fg_id = TH_TEXT;
 
71
        int shade = do_tint ? 0 : -6;
 
72
 
70
73
        if (report->flag & SELECT) {
71
 
                fg[0] = 255; fg[1] = 255; fg[2] = 255;
72
 
                if (do_tint) {
73
 
                        bg[0] = 96; bg[1] = 128; bg[2] = 255;
74
 
                }
75
 
                else {
76
 
                        bg[0] = 90; bg[1] = 122; bg[2] = 249;
77
 
                }
 
74
                bg_id = TH_INFO_SELECTED;
 
75
                fg_id = TH_INFO_SELECTED_TEXT;
 
76
        }
 
77
        else if (report->type & RPT_ERROR_ALL) {
 
78
                bg_id = TH_INFO_ERROR;
 
79
                fg_id = TH_INFO_ERROR_TEXT;
 
80
        }
 
81
        else if (report->type & RPT_WARNING_ALL) {
 
82
                bg_id = TH_INFO_WARNING;
 
83
                fg_id = TH_INFO_WARNING_TEXT;
 
84
        }
 
85
        else if (report->type & RPT_INFO_ALL) {
 
86
                bg_id = TH_INFO_INFO;
 
87
                fg_id = TH_INFO_INFO_TEXT;
 
88
        }
 
89
        else if (report->type & RPT_DEBUG_ALL) {
 
90
                bg_id = TH_INFO_DEBUG;
 
91
                fg_id = TH_INFO_DEBUG_TEXT;
78
92
        }
79
93
        else {
80
 
                fg[0] = 0; fg[1] = 0; fg[2] = 0;
81
 
                
82
 
                if (report->type & RPT_ERROR_ALL) {
83
 
                        if (do_tint) { bg[0] = 220; bg[1] = 0;   bg[2] = 0;   }
84
 
                        else         { bg[0] = 214; bg[1] = 0;   bg[2] = 0;   }
85
 
                }
86
 
                else if (report->type & RPT_WARNING_ALL) {
87
 
                        if (do_tint) { bg[0] = 220; bg[1] = 128; bg[2] = 96;  }
88
 
                        else         { bg[0] = 214; bg[1] = 122; bg[2] = 90;  }
89
 
                }
90
 
#if 0 // XXX: this looks like the selected color, so don't use this
91
 
                else if (report->type & RPT_OPERATOR_ALL) {
92
 
                        if (do_tint) { bg[0] = 96;  bg[1] = 128; bg[2] = 255; }
93
 
                        else         { bg[0] = 90;  bg[1] = 122; bg[2] = 249; }
94
 
                }
95
 
#endif
96
 
                else if (report->type & RPT_INFO_ALL) {
97
 
                        if (do_tint) { bg[0] = 0;   bg[1] = 170; bg[2] = 0;   }
98
 
                        else         { bg[0] = 0;   bg[1] = 164; bg[2] = 0;   }
99
 
                }
100
 
                else if (report->type & RPT_DEBUG_ALL) {
101
 
                        if (do_tint) { bg[0] = 196; bg[1] = 196; bg[2] = 196; }
102
 
                        else         { bg[0] = 190; bg[1] = 190; bg[2] = 190; }
103
 
                }
104
 
                else {
105
 
                        if (do_tint) { bg[0] = 120; bg[1] = 120; bg[2] = 120; }
106
 
                        else         { bg[0] = 114; bg[1] = 114; bg[2] = 114; }
107
 
                }
 
94
                bg_id = TH_BACK;
 
95
                fg_id = TH_TEXT;
108
96
        }
 
97
 
 
98
        UI_GetThemeColorShade3ubv(bg_id, shade, bg);
 
99
        UI_GetThemeColor3ubv(fg_id, fg);
109
100
}
110
101
 
111
102
/* reports! */
148
139
        /* iterator */
149
140
        tvc->iter = reports->list.last;
150
141
 
151
 
        glClearColor(120.0 / 255.0, 120.0 / 255.0, 120.0 / 255.0, 1.0);
 
142
        UI_ThemeClearColor(TH_BACK);
152
143
        glClear(GL_COLOR_BUFFER_BIT);
153
144
 
154
145
#ifdef USE_INFO_NEWLINE