Page MenuHome
Differential D829

Add theme option for UI emboss
AbandonedPublic
Actions

Authored by Jonathan Williamson (carter2422) on Oct 15 2014, 11:59 PM.

Details

Reviewers
Campbell Barton (campbellbarton)
Pablo Vazquez (pablovazquez)
Maniphest Tasks
T42228: Remove widget emboss
Summary

This adds a theme option for UI emboss style and slightly updates the User Prefereces > Themes > User Interface to reflect it per discussion on T42228. Thanks to @Julian Eisel (Severin) for the helpful walkthrough!

Diff Detail

Repository
rB Blender
Branch
interface/widget-emboss-color

Event Timeline

Jonathan Williamson (carter2422) updated this revision to Diff 2724.Oct 15 2014, 11:59 PM
Jonathan Williamson (carter2422) retitled this revision from to This adds a theme option for UI emboss style and slightly updates the User Prefereces > Themes > User Interface to reflect it per discussion on T42228. Thanks to @severin for the helpful walkthrough!.
Jonathan Williamson (carter2422) added reviewers: Pablo Vazquez (pablovazquez), Campbell Barton (campbellbarton).
Jonathan Williamson (carter2422) added subscribers: Julian Eisel (Severin), Pablo Vazquez (pablovazquez), Campbell Barton (campbellbarton).
Jonathan Williamson (carter2422) added a task: T42228: Remove widget emboss.Oct 15 2014, 11:59 PM
Jonathan Williamson (carter2422) retitled this revision from This adds a theme option for UI emboss style and slightly updates the User Prefereces > Themes > User Interface to reflect it per discussion on T42228. Thanks to @severin for the helpful walkthrough! to Add theme option for UI emboss.
Jonathan Williamson (carter2422) updated this object.
Jonathan Williamson (carter2422) added a project: User Interface.
Jonathan Williamson (carter2422) updated this revision to Diff 2725.Oct 16 2014, 12:18 AM
  • Replace dummy char with 'pad' per Severin's suggestion.
Vitor Balbio (vitorbalbio) added a subscriber: Vitor Balbio (vitorbalbio).Oct 16 2014, 12:26 AM
Julian Eisel (Severin) added inline comments.Oct 16 2014, 12:31 AM
source/blender/makesdna/DNA_userdef_types.h
172

This isn't really needed, you can just change short pad (line 178) to short pad[3], instead

Pablo Vazquez (pablovazquez) edited edge metadata.Oct 16 2014, 4:08 PM

Looks good!

Commented inline about a compile error.

source/blender/editors/interface/interface_widgets.c
760

I'm no dev, but I get a build error because of this. (ISO C90 forbids mixed declarations and code)

Declarations should be done at the beginning of the block (line 749, where the loop starts).

Jonathan Williamson (carter2422) updated this revision to Diff 2743.Oct 21 2014, 7:18 PM
Jonathan Williamson (carter2422) edited edge metadata.
  • Move declaration to beginning of loop.
  • Adjust short pad
Jonathan Williamson (carter2422) added a comment.Oct 21 2014, 7:19 PM

Thanks for the comments @Julian Eisel (Severin) and @venomgfx. Updated the diff.

Anything else needed @Campbell Barton (campbellbarton)?

Campbell Barton (campbellbarton) edited edge metadata.Oct 23 2014, 12:04 PM

Suggest not to draw emboss if alpha == 0

Note, on my system emboss isn't being initialized, probably needs version bump? (all zeros, resetting factory defaults fixes)

source/blender/editors/interface/interface_widgets.c
762

this can be handled a little smarter...

if (wtb->emboss) {
    UI_GetThemeColor4ubv(TH_EMBOSS, emboss);
    if (emboss[3]) {
        .....glColor4ubv. glVertexPointer, glDrawArrays... etc
    }
Diego Gangl (januz) added a subscriber: Diego Gangl (januz).Oct 24 2014, 1:28 AM

Love the idea of using alpha for emboss.

It initalized correctly the first time here, but changing theme or using "Reset to default" changed it to black with 0 alpha (patched on current master / Graph theme).

Jonathan Williamson (carter2422) updated this revision to Diff 2753.Oct 24 2014, 9:35 PM
Jonathan Williamson (carter2422) edited edge metadata.
  • Update widget emboss to only draw if alpha =! to zero
Jonathan Williamson (carter2422) added a comment.Oct 24 2014, 9:37 PM
In D829#13072, @Campbell Barton (campbellbarton) wrote:

Suggest not to draw emboss if alpha == 0

Note, on my system emboss isn't being initialized, probably needs version bump? (all zeros, resetting factory defaults fixes)

Thanks @Campbell Barton (campbellbarton)! Is that's what you meant for the version bump?

Kévin Dietrich (kevindietrich) added a subscriber: Kévin Dietrich (kevindietrich).Oct 24 2014, 10:08 PM

Emboss isn't initialized here, R, G, B & A are set to 0.0.

source/blender/editors/interface/resources.c
2499

I believe you should do the version bump here with "U.subversionfile < 2" instead of "U.subversionfile < 1".
In this case there's already such a loop line 2443.

Jonathan Williamson (carter2422) updated this revision to Diff 2754.Oct 24 2014, 10:34 PM
  • Revert "Update widget emboss to only draw if alpha =! to zero"
  • Fix version and re-add check for alpha on emboss
Jonathan Williamson (carter2422) added a comment.Oct 24 2014, 10:34 PM
In D829#13122, @Kévin Dietrich (kevindietrich) wrote:

Emboss isn't initialized here, R, G, B & A are set to 0.0.

Oh right! Fixed now :)

Jonathan Williamson (carter2422) abandoned this revision.Oct 27 2014, 6:16 PM

Committed in rB6c2ce7a3828e92083dfdad85eb683f4d27ed852b

Revision Contents
Changeset List

PathSize
release/
scripts/
startup/
bl_ui/
15 lines
source/
blender/
editors/
include/
2 lines
interface/
11 lines
13 lines
makesdna/
4 lines
makesrna/
intern/
6 lines

Diff 2754

View Options

release/scripts/startup/bl_ui/space_userpref.py

Loading...
View Options

source/blender/editors/include/UI_resources.h

Loading...
View Options

source/blender/editors/interface/interface_widgets.c

Loading...
View Options

source/blender/editors/interface/resources.c

Loading...
View Options

source/blender/makesdna/DNA_userdef_types.h

Loading...
View Options

source/blender/makesrna/intern/rna_userdef.c

Loading...