Paths

Table of Contentst

Differential D6877

Theming Time Markers
ClosedPublic
Actions

Authored by Michael Soluyanov (crantisz) on Feb 18 2020, 1:20 PM.

Tags

Subscribers

Julian Eisel (Severin)

William Reynish (billreynish)

Tokens

"Like" token, awarded by amonpaike."Love" token, awarded by 1D_Inc."Love" token, awarded by HooglyBoogly."Love" token, awarded by billreynish.

Details

Reviewers

Julian Eisel (Severin)
William Reynish (billreynish)

Group Reviewers

Commits

rBa4a1074f3d24: UI: Add theme option for time markers line

Summary

This patch adds ability to set colors and alpha of dashed line of Time Markers.

Before:

(Marker lines invisible on white background)

After:

(An example of theming)

UI:

Diff Detail

Repository: rB Blender

Event Timeline

Michael Soluyanov (crantisz) created this revision.Feb 18 2020, 1:20 PM

Michael Soluyanov (crantisz) edited the summary of this revision. (Show Details)

William Reynish (billreynish) awarded a token.Feb 18 2020, 1:23 PM

Correct default values matches current

Michael Soluyanov (crantisz) edited the summary of this revision. (Show Details)Feb 18 2020, 1:32 PM

Guess this is fine. Am almost ready to accept this.

source/blender/editors/animation/anim_markers.c
511	I'd suggest a few changes here: Don't add this new function, re-use `marker_color_get()` but change it's argument list: `static void marker_colors_get(const TimeMarker marker, uchar r_text_color, uchar *r_line_color)`. I'd call this function here to retrieve both colors, and pass them to `draw_marker_line()` and `draw_marker_name()`. In `draw_marker_line()` you can change the `immUniformColor4fv()` to `immUniformColor4ubv()` so that it accepts the `uchar` array.

This revision now requires changes to proceed.Feb 18 2020, 2:48 PM

In D6877#162921, @Julian Eisel (Severin) wrote:

Don't add this new function, re-use marker_color_get()

This one gets different colors, TH_TEXT_HI and TH_TEXT instead new one

Yes, but the function could return two colors, uchar *r_text_color and uchar *r_line_color.

Julian Eisel (Severin) edited reviewers, added: User Interface; removed: Pablo Vazquez (pablovazquez), Brecht Van Lommel (brecht), Julian Eisel (Severin).Feb 18 2020, 4:05 PM

This revision now requires review to proceed.Feb 18 2020, 4:05 PM

Julian Eisel (Severin) requested changes to this revision.Feb 18 2020, 4:05 PM

This revision now requires changes to proceed.Feb 18 2020, 4:05 PM

Hans Goudey (HooglyBoogly) awarded a token.Feb 18 2020, 4:28 PM

Requested changes

Paul Kotelevets (1D_Inc) awarded a token.Feb 19 2020, 2:13 AM

noki paike (amonpaike) awarded a token.Feb 19 2020, 9:01 AM

LGTM now

Julian Eisel (Severin) accepted this revision.Feb 25 2020, 3:10 PM

This revision is now accepted and ready to land.Feb 25 2020, 3:10 PM

Closed by commit rBa4a1074f3d24: UI: Add theme option for time markers line (authored by Michael Soluyanov (crantisz), committed by Julian Eisel (Severin)). · Explain WhyFeb 25 2020, 3:19 PM

This revision was automatically updated to reflect the committed changes.

Julian Eisel (Severin) added a commit: rBa4a1074f3d24: UI: Add theme option for time markers line.

Revision Contents
Changeset List

Path

Size

release/

datafiles/

userdef/

userdef_default_theme.c

10 lines

source/

blender/

blenkernel/

BKE_blender_version.h

2 lines

blenloader/

intern/

versioning_280.c

26 lines

versioning_userdef.c

13 lines

editors/

animation/

41 lines

include/

2 lines

interface/

6 lines

makesdna/

DNA_userdef_types.h

1 line

makesrna/

intern/

54 lines

Diff 22041

release/datafiles/userdef/userdef_default_theme.c

Loading...

source/blender/blenkernel/BKE_blender_version.h

Loading...

source/blender/blenloader/intern/versioning_280.c

Loading...

source/blender/blenloader/intern/versioning_userdef.c

Loading...

source/blender/editors/animation/anim_markers.c

Loading...

source/blender/editors/include/UI_resources.h

Loading...

source/blender/editors/interface/resources.c

Loading...

source/blender/makesdna/DNA_userdef_types.h

Loading...

source/blender/makesrna/intern/rna_userdef.c

Loading...