|
@@ -45,6 +45,13 @@ namespace BansheeEngine
|
|
|
markContentAsDirty();
|
|
markContentAsDirty();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ void GUIButtonBase::setTint(const Color& color)
|
|
|
|
|
+ {
|
|
|
|
|
+ mColor = color;
|
|
|
|
|
+
|
|
|
|
|
+ markContentAsDirty();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
void GUIButtonBase::_setOn(bool on)
|
|
void GUIButtonBase::_setOn(bool on)
|
|
|
{
|
|
{
|
|
|
if(on)
|
|
if(on)
|
|
@@ -113,6 +120,7 @@ namespace BansheeEngine
|
|
|
mImageDesc.borderRight = _getStyle()->border.right;
|
|
mImageDesc.borderRight = _getStyle()->border.right;
|
|
|
mImageDesc.borderTop = _getStyle()->border.top;
|
|
mImageDesc.borderTop = _getStyle()->border.top;
|
|
|
mImageDesc.borderBottom = _getStyle()->border.bottom;
|
|
mImageDesc.borderBottom = _getStyle()->border.bottom;
|
|
|
|
|
+ mImageDesc.color = mColor;
|
|
|
|
|
|
|
|
mImageSprite->update(mImageDesc, (UINT64)_getParentWidget());
|
|
mImageSprite->update(mImageDesc, (UINT64)_getParentWidget());
|
|
|
|
|
|
|
@@ -124,6 +132,7 @@ namespace BansheeEngine
|
|
|
contentImgDesc.texture = mContent.getImage().getInternalPtr();
|
|
contentImgDesc.texture = mContent.getImage().getInternalPtr();
|
|
|
contentImgDesc.width = mContent.getImage()->getWidth();
|
|
contentImgDesc.width = mContent.getImage()->getWidth();
|
|
|
contentImgDesc.height = mContent.getImage()->getHeight();
|
|
contentImgDesc.height = mContent.getImage()->getHeight();
|
|
|
|
|
+ contentImgDesc.color = mColor;
|
|
|
|
|
|
|
|
mContentImageSprite->update(contentImgDesc, (UINT64)_getParentWidget());
|
|
mContentImageSprite->update(contentImgDesc, (UINT64)_getParentWidget());
|
|
|
}
|
|
}
|
|
@@ -300,6 +309,7 @@ namespace BansheeEngine
|
|
|
textDesc.text = mContent.getText();
|
|
textDesc.text = mContent.getText();
|
|
|
textDesc.font = _getStyle()->font;
|
|
textDesc.font = _getStyle()->font;
|
|
|
textDesc.fontSize = _getStyle()->fontSize;
|
|
textDesc.fontSize = _getStyle()->fontSize;
|
|
|
|
|
+ textDesc.color = mColor * getActiveTextColor();
|
|
|
|
|
|
|
|
Rect2I textBounds = getCachedContentBounds();
|
|
Rect2I textBounds = getCachedContentBounds();
|
|
|
|
|
|
|
@@ -342,4 +352,29 @@ namespace BansheeEngine
|
|
|
|
|
|
|
|
return _getStyle()->normal.texture;
|
|
return _getStyle()->normal.texture;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ Color GUIButtonBase::getActiveTextColor() const
|
|
|
|
|
+ {
|
|
|
|
|
+ switch (mActiveState)
|
|
|
|
|
+ {
|
|
|
|
|
+ case GUIButtonState::Normal:
|
|
|
|
|
+ return _getStyle()->normal.textColor;
|
|
|
|
|
+ case GUIButtonState::Hover:
|
|
|
|
|
+ return _getStyle()->hover.textColor;
|
|
|
|
|
+ case GUIButtonState::Active:
|
|
|
|
|
+ return _getStyle()->active.textColor;
|
|
|
|
|
+ case GUIButtonState::Focused:
|
|
|
|
|
+ return _getStyle()->focused.textColor;
|
|
|
|
|
+ case GUIButtonState::NormalOn:
|
|
|
|
|
+ return _getStyle()->normalOn.textColor;
|
|
|
|
|
+ case GUIButtonState::HoverOn:
|
|
|
|
|
+ return _getStyle()->hoverOn.textColor;
|
|
|
|
|
+ case GUIButtonState::ActiveOn:
|
|
|
|
|
+ return _getStyle()->activeOn.textColor;
|
|
|
|
|
+ case GUIButtonState::FocusedOn:
|
|
|
|
|
+ return _getStyle()->focusedOn.textColor;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return _getStyle()->normal.textColor;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|