[Bf-blender-cvs] [55dcdb9] master: Fix T47324: Edit-text in list view theme glitch

[Campbell Barton]

Commit: 55dcdb9bd735046f8f9d2a4c9e6ee0d922ff3d2a
Author: Campbell Barton
Date:   Fri Feb 5 02:57:53 2016 +1100
Branches: master
https://developer.blender.org/rB55dcdb9bd735046f8f9d2a4c9e6ee0d922ff3d2a

Fix T47324: Edit-text in list view theme glitch

Use existing text select colors when text matches select color.

===================================================================

M	source/blender/editors/interface/interface_widgets.c
M	source/blender/editors/interface/resources.c

===================================================================

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index e493fe9..f803622 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1867,10 +1867,10 @@ static struct uiWidgetColors wcol_list_item = {
 	{0, 0, 0, 255},
 	{0, 0, 0, 0},
 	{86, 128, 194, 255},
-	{0, 0, 0, 255},
+	{90, 90, 90, 255},
 	
 	{0, 0, 0, 255},
-	{0, 0, 0, 255},
+	{255, 255, 255, 255},
 	
 	0,
 	0, 0
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 18bf409..c23df5c 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2694,6 +2694,21 @@ void init_userdef_do_versions(void)
 		}
 	}
 
+	/**
+	 * Include next version bump.
+	 *
+	 * (keep this block even if it becomes empty).
+	 */
+	{
+		bTheme *btheme;
+		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+			if (memcmp(btheme->tui.wcol_list_item.item, btheme->tui.wcol_list_item.text_sel, sizeof(char) * 3) == 0) {
+				copy_v4_v4_char(btheme->tui.wcol_list_item.item, btheme->tui.wcol_text.item);
+				copy_v4_v4_char(btheme->tui.wcol_list_item.text_sel, btheme->tui.wcol_text.text_sel);
+			}
+		}
+	}
+
 	if (U.pixelsize == 0.0f)
 		U.pixelsize = 1.0f;