[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54620] trunk/blender: fix [#34279] Python console: Selected region is not highlighted when using white background color
Campbell Barton
ideasman42 at gmail.com
Mon Feb 18 03:36:37 CET 2013
Revision: 54620
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54620
Author: campbellbarton
Date: 2013-02-18 02:36:36 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
fix [#34279] Python console: Selected region is not highlighted when using white background color
Modified Paths:
--------------
trunk/blender/release/scripts/presets/interface_theme/back_to_black.xml
trunk/blender/release/scripts/presets/interface_theme/blender_24x.xml
trunk/blender/release/scripts/presets/interface_theme/elsyiun.xml
trunk/blender/release/scripts/presets/interface_theme/hexagon.xml
trunk/blender/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
trunk/blender/source/blender/blenlib/intern/math_color_inline.c
trunk/blender/source/blender/editors/include/UI_resources.h
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/space_console/console_draw.c
trunk/blender/source/blender/editors/space_info/info_draw.c
trunk/blender/source/blender/editors/space_info/textview.c
trunk/blender/source/blender/editors/space_info/textview.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/release/scripts/presets/interface_theme/back_to_black.xml
===================================================================
--- trunk/blender/release/scripts/presets/interface_theme/back_to_black.xml 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/release/scripts/presets/interface_theme/back_to_black.xml 2013-02-18 02:36:36 UTC (rev 54620)
@@ -800,7 +800,8 @@
line_input="#cecece"
line_info="#00aa00"
line_error="#dc6060"
- cursor="#dc6060">
+ cursor="#dc6060"
+ select="#ffffff30">
<space>
<ThemeSpaceGeneric back="#0f0f0f"
title="#5d5d5d"
Modified: trunk/blender/release/scripts/presets/interface_theme/blender_24x.xml
===================================================================
--- trunk/blender/release/scripts/presets/interface_theme/blender_24x.xml 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/release/scripts/presets/interface_theme/blender_24x.xml 2013-02-18 02:36:36 UTC (rev 54620)
@@ -800,7 +800,8 @@
line_input="#ffffff"
line_info="#00aa00"
line_error="#dc6060"
- cursor="#dc6060">
+ cursor="#dc6060"
+ select="#c6777799">
<space>
<ThemeSpaceGeneric back="#b4b4b4"
title="#000000"
Modified: trunk/blender/release/scripts/presets/interface_theme/elsyiun.xml
===================================================================
--- trunk/blender/release/scripts/presets/interface_theme/elsyiun.xml 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/release/scripts/presets/interface_theme/elsyiun.xml 2013-02-18 02:36:36 UTC (rev 54620)
@@ -800,7 +800,8 @@
line_input="#ffffff"
line_info="#00aa00"
line_error="#dc6060"
- cursor="#dc6060">
+ cursor="#dc6060"
+ select="#4e4e8f80">
<space>
<ThemeSpaceGeneric back="#202020"
title="#000000"
Modified: trunk/blender/release/scripts/presets/interface_theme/hexagon.xml
===================================================================
--- trunk/blender/release/scripts/presets/interface_theme/hexagon.xml 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/release/scripts/presets/interface_theme/hexagon.xml 2013-02-18 02:36:36 UTC (rev 54620)
@@ -800,7 +800,8 @@
line_input="#ffffff"
line_info="#00aa00"
line_error="#dc0606"
- cursor="#dc6060">
+ cursor="#dc6060"
+ select="#ffffff30">
<space>
<ThemeSpaceGeneric back="#7c7e88"
title="#000000"
Modified: trunk/blender/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
===================================================================
--- trunk/blender/release/scripts/presets/interface_theme/ubuntu_ambiance.xml 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/release/scripts/presets/interface_theme/ubuntu_ambiance.xml 2013-02-18 02:36:36 UTC (rev 54620)
@@ -800,7 +800,8 @@
line_input="#19b6ee"
line_info="#f47421"
line_error="#ff0000"
- cursor="#f47421">
+ cursor="#f47421"
+ select="#641f4480">
<space>
<ThemeSpaceGeneric back="#131311"
title="#000000"
Modified: trunk/blender/source/blender/blenlib/intern/math_color_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_color_inline.c 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/source/blender/blenlib/intern/math_color_inline.c 2013-02-18 02:36:36 UTC (rev 54620)
@@ -174,7 +174,8 @@
}
/* color macros for themes */
-#define rgba_char_args_set_fl(col, r, g, b, a) rgba_char_args_set(col, r * 255, g * 255, b * 255, a * 255)
+#define rgba_char_args_set_fl(col, r, g, b, a) \
+ rgba_char_args_set(col, (r) * 255, (g) * 255, (b) * 255, (a) * 255)
MINLINE void rgba_char_args_set(char col[4], const char r, const char g, const char b, const char a)
{
Modified: trunk/blender/source/blender/editors/include/UI_resources.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_resources.h 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/source/blender/editors/include/UI_resources.h 2013-02-18 02:36:36 UTC (rev 54620)
@@ -155,6 +155,7 @@
TH_CONSOLE_INFO,
TH_CONSOLE_ERROR,
TH_CONSOLE_CURSOR,
+ TH_CONSOLE_SELECT,
TH_SEQ_MOVIE,
TH_SEQ_MOVIECLIP,
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/source/blender/editors/interface/resources.c 2013-02-18 02:36:36 UTC (rev 54620)
@@ -427,6 +427,8 @@
cp = ts->console_error; break;
case TH_CONSOLE_CURSOR:
cp = ts->console_cursor; break;
+ case TH_CONSOLE_SELECT:
+ cp = ts->console_select; break;
case TH_HANDLE_VERTEX:
cp = ts->handle_vertex;
@@ -937,6 +939,7 @@
rgba_char_args_set(btheme->tconsole.console_info, 0, 170, 0, 255);
rgba_char_args_set(btheme->tconsole.console_error, 220, 96, 96, 255);
rgba_char_args_set(btheme->tconsole.console_cursor, 220, 96, 96, 255);
+ rgba_char_args_set(btheme->tconsole.console_select, 255, 255, 255, 48);
/* space time */
btheme->ttime = btheme->tv3d;
@@ -2135,6 +2138,13 @@
}
}
+ if (U.versionfile < 265 || (U.versionfile == 265 && U.subversionfile < 11)) {
+ bTheme *btheme;
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ rgba_char_args_test_set(btheme->tconsole.console_select, 255, 255, 255, 48);
+ }
+ }
+
/* NOTE!! from now on use U.versionfile and U.subversionfile */
Modified: trunk/blender/source/blender/editors/space_console/console_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_draw.c 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/source/blender/editors/space_console/console_draw.c 2013-02-18 02:36:36 UTC (rev 54620)
@@ -193,6 +193,10 @@
return TVC_LINE_FG;
}
+static void console_textview_const_colors(TextViewContext *UNUSED(tvc), unsigned char bg_sel[4])
+{
+ UI_GetThemeColor4ubv(TH_CONSOLE_SELECT, bg_sel);
+}
static int console_textview_main__internal(struct SpaceConsole *sc, ARegion *ar, int draw,
int mval[2], void **mouse_pick, int *pos_pick)
@@ -210,6 +214,7 @@
tvc.step = console_textview_step;
tvc.line_get = console_textview_line_get;
tvc.line_color = console_textview_line_color;
+ tvc.const_colors = console_textview_const_colors;
tvc.arg1 = sc;
tvc.arg2 = NULL;
Modified: trunk/blender/source/blender/editors/space_info/info_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_draw.c 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/source/blender/editors/space_info/info_draw.c 2013-02-18 02:36:36 UTC (rev 54620)
@@ -251,7 +251,8 @@
#undef USE_INFO_NEWLINE
-static int info_textview_main__internal(struct SpaceInfo *sinfo, ARegion *ar, ReportList *reports, int draw, int mval[2], void **mouse_pick, int *pos_pick)
+static int info_textview_main__internal(struct SpaceInfo *sinfo, ARegion *ar, ReportList *reports,
+ int draw, int mval[2], void **mouse_pick, int *pos_pick)
{
int ret = 0;
@@ -264,6 +265,7 @@
tvc.step = report_textview_step;
tvc.line_get = report_textview_line_get;
tvc.line_color = report_textview_line_color;
+ tvc.const_colors = NULL;
tvc.arg1 = sinfo;
tvc.arg2 = reports;
Modified: trunk/blender/source/blender/editors/space_info/textview.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/textview.c 2013-02-17 22:13:00 UTC (rev 54619)
+++ trunk/blender/source/blender/editors/space_info/textview.c 2013-02-18 02:36:36 UTC (rev 54620)
@@ -68,7 +68,8 @@
cdc->sel[1] += step;
}
-static void console_draw_sel(const int sel[2], const int xy[2], const int str_len_draw, int cwidth, int lheight)
+static void console_draw_sel(const int sel[2], const int xy[2], const int str_len_draw, int cwidth, int lheight,
+ const unsigned char bg_sel[4])
{
if (sel[0] <= str_len_draw && sel[1] >= 0) {
const int sta = max_ii(sel[0], 0);
@@ -76,7 +77,7 @@
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4ub(255, 255, 255, 48);
+ glColor4ubv(bg_sel);
glRecti(xy[0] + (cwidth * sta), xy[1] - 2 + lheight, xy[0] + (cwidth * end), xy[1] - 2);
@@ -84,12 +85,11 @@
}
}
-
/* return 0 if the last line is off the screen
* should be able to use this for any string type */
static int console_draw_string(ConsoleDrawContext *cdc, const char *str, const int str_len,
- const unsigned char *fg, const unsigned char *bg)
+ const unsigned char fg[3], const unsigned char bg[3], const unsigned char bg_sel[4])
{
int rct_ofs = cdc->lheight / 4;
int tot_lines = (str_len / cdc->console_width) + 1; /* total number of lines for wrapping */
@@ -105,7 +105,8 @@
/* wrap */
if (str_len > cdc->console_width)
- ofs += (cdc->console_width * ((int)((((float)(y_next - cdc->mval[1]) / (float)(y_next - cdc->xy[1])) * tot_lines))));
+ ofs += cdc->console_width * ((int)((((float)(y_next - cdc->mval[1]) /
+ (float)(y_next - cdc->xy[1])) * tot_lines)));
CLAMP(ofs, 0, str_len);
*cdc->pos_pick += str_len - ofs;
@@ -155,7 +156,7 @@
if (cdc->sel[0] != cdc->sel[1]) {
console_step_sel(cdc, -initial_offset);
// glColor4ub(255, 0, 0, 96); // debug
- console_draw_sel(cdc->sel, cdc->xy, str_len % cdc->console_width, cdc->cwidth, cdc->lheight);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list