[Bf-blender-cvs] [3482aebf8d5] master: Theme: set dark grey for line number background
Campbell Barton
noreply at git.blender.org
Tue May 7 09:20:24 CEST 2019
Commit: 3482aebf8d501a6cf63d95219d628cfb3041de76
Author: Campbell Barton
Date: Tue May 7 17:18:18 2019 +1000
Branches: master
https://developer.blender.org/rB3482aebf8d501a6cf63d95219d628cfb3041de76
Theme: set dark grey for line number background
This color is also used for the right margin,
so use a color that contrasts with the background.
Also use 2x width line.
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/editors/space_text/text_draw.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 9c763c5b2a1..d1e2fa876d8 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -705,7 +705,7 @@ const bTheme U_theme_default = {
},
.shade2 = RGBA(0x5680c2e6),
.hilite = RGBA(0xff0000ff),
- .grid = RGBA(0x313133ff),
+ .grid = RGBA(0x202020ff),
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c
index 678879018a7..ac1fb4af1c2 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -1665,12 +1665,14 @@ void draw_text_main(SpaceText *st, ARegion *ar)
immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
+ GPU_line_width(2.0f);
+
float viewport_size[4];
GPU_viewport_size_get_f(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
- immUniform1i("colors_len", 0); /* "simple" mode */
- immUniformThemeColor(TH_GRID); /* same color as line number background */
+ immUniform1i("colors_len", 0); /* "simple" mode */
+ immUniformThemeColor3(TH_GRID); /* same color as line number background */
immUniform1f("dash_width", 2.0f);
immUniform1f("dash_factor", 0.5f);
More information about the Bf-blender-cvs
mailing list