[gui] added colordiffuse attribute on texture definition

[xhaggi]

This PR adds color diffuse attribute for texture definitions.

It's based on the PR #268 and gets rid of the borderdiffuse attribute. also it don't override m_diffuseColor as @jmarshallnz has suggested.

Example:

<texture colordiffuse="FFFFAAFF">texture.png</texture>
<texture colordiffuse="$VAR[colordiffuse]">texture.png</texture>
<texture colordiffuse="$INFO[colordiffuse]">texture.png</texture>

Works for all texture controls, for example textureradioon, textureradiooff, texturefocus, texturenofocus etc.

[xhaggi]

it would be nice if this gets into frodo, because without this you need two button controls to use a colordiffuse while button gets focused.

[ronie]

there are 100's of things that would be nice to have in frodo :)

but reality is, we're way past feature freeze and have beta1 knocking around the corner.

[xhaggi]

@ronie i only want a statement if this could get in or not .. sorry if I seem a little impatient ;)

[jmarshallnz]

No, this won't be going in for Frodo.

[xhaggi]

@jmarshallnz is there a reason why this is rejected?

[MartijnKaijser]

@xhaggi
Because we are in feature freeze for a month so nothing will be added until after Frodo release

[xhaggi]

thanks

[lemonboy999]

Now you have some time, you should look at a couple of extra things. Since I put the original PR in, the code base has moved on. The change as submitted does not allow for skin variables to be used in the texture colordiffuse attribute, whereas the control diffusecolor allows this. Also I don't think the original point with one diffuse overriding the other was the real issue, I thought it was about merging the two. The reason the borderdiffuse was rejected was because you could use a bordertexture, however this cannot be applied as an attribute - maybe you could look at this as well.

[xhaggi]

@lemonboy999 as you can see in the main description of this PR, it is possible to use $VAR and $INFO .. so i don't know what you mean with skin variables?

[lemonboy999]

Sorry, I meant that although you can put a $VAR as the colordiffuse attribute, it will only use the value when the control is created and wont update as the $VAR changes. You need to put an extra check in the TextureBase::SetDiffuseColor routine.

[ghost]

@jmarshallnz post-frodo ping.

[jmarshallnz]

You currently don't call Update() on the CGUIInfoColor, so it won't work with $INFO or $VAR as things stand. I suggest calling it in SetDiffusedColor() would be the best place. Obviously you need to check the Update() routine's return value to return the appropriate changed status.

Exactly how the control's diffuse color and the textures diffuse color interact will need defining. ATM you have the texture's diffuse color overriding the controls. This may not be what is wanted. For example, it might make sense for them to be diffused (multiplied).

[xhaggi]

@jmarshallnz thank you for the hints .. i will change it in a few days.

The main reason for this PR is to use it on button controls with <texturefocus colordiffuse="">, so you don't need a second texture or control for highlighting. Well, i don't know if multiply the diffuse color is the best way.

[xhaggi]

@jmarshallnz changed up on your hints

[jmarshallnz]

Looks good. Queued for next merge window (May 1->May 10). Before then, it'll need squashing down.

[phil65]

would it be lot of work to also allow this for radiobutton textures? that would be great, too.

[xhaggi]

@phil65 it work's for every texture control .. the comment was an unfortunate choise , I will update it

[ghost]

Will this also work for the label / altlabel of the togglebutton?

Edit:
Ok, thnx. Either way, awesome work.

[xhaggi]

@MassIV only for texture controls .. no labels.

[xhaggi]

@MartijnKaijser something wrong with this, because it was not included in the last merge window

[jmarshallnz]

Nope - my fault for not hitting the button. Apologies.

[xhaggi]

i updated the wiki http://wiki.xbmc.org/index.php?title=Texture_Attributes#Attributes_of_the_texture_tags

[jmarshallnz]

Thanks - we'll keep you on :)