diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-02-04 18:57:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-02-04 19:28:22 +0300 |
commit | 55dcdb9bd735046f8f9d2a4c9e6ee0d922ff3d2a (patch) | |
tree | b257298ab656664c3b746e1e3d5da902858d4d80 /source/blender | |
parent | e7e9613fe6a8580cefba4b85459eedf7ebca2e98 (diff) |
Fix T47324: Edit-text in list view theme glitch
Use existing text select colors when text matches select color.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index e493fe96f9c..f803622ed62 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 18bf409f2df..c23df5cf010 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; |