Cleanups CGUISprite, removes redundant method.
This was SVN commit r25172.
This commit is contained in:
parent
22ea79a56f
commit
1b5ed5063f
@ -78,9 +78,9 @@ void CGUIScrollBarVertical::Draw()
|
||||
if (m_ButtonMinusHovered)
|
||||
{
|
||||
if (m_ButtonMinusPressed)
|
||||
button_top = &(GetStyle()->m_SpriteButtonTopPressed || GetStyle()->m_SpriteButtonTop);
|
||||
button_top = &(GetStyle()->m_SpriteButtonTopPressed ? GetStyle()->m_SpriteButtonTopPressed : GetStyle()->m_SpriteButtonTop);
|
||||
else
|
||||
button_top = &(GetStyle()->m_SpriteButtonTopOver || GetStyle()->m_SpriteButtonTop);
|
||||
button_top = &(GetStyle()->m_SpriteButtonTopOver ? GetStyle()->m_SpriteButtonTopOver : GetStyle()->m_SpriteButtonTop);
|
||||
}
|
||||
else
|
||||
button_top = &GetStyle()->m_SpriteButtonTop;
|
||||
@ -88,9 +88,9 @@ void CGUIScrollBarVertical::Draw()
|
||||
if (m_ButtonPlusHovered)
|
||||
{
|
||||
if (m_ButtonPlusPressed)
|
||||
button_bottom = &(GetStyle()->m_SpriteButtonBottomPressed || GetStyle()->m_SpriteButtonBottom);
|
||||
button_bottom = &(GetStyle()->m_SpriteButtonBottomPressed ? GetStyle()->m_SpriteButtonBottomPressed : GetStyle()->m_SpriteButtonBottom);
|
||||
else
|
||||
button_bottom = &(GetStyle()->m_SpriteButtonBottomOver || GetStyle()->m_SpriteButtonBottom);
|
||||
button_bottom = &(GetStyle()->m_SpriteButtonBottomOver ? GetStyle()->m_SpriteButtonBottomOver : GetStyle()->m_SpriteButtonBottom);
|
||||
}
|
||||
else
|
||||
button_bottom = &GetStyle()->m_SpriteButtonBottom;
|
||||
|
@ -157,16 +157,6 @@ public:
|
||||
*/
|
||||
operator bool() const { return !m_SpriteName.empty(); };
|
||||
|
||||
/**
|
||||
* Returns this sprite if it has been set, otherwise the given fallback sprite.
|
||||
*/
|
||||
const CGUISpriteInstance& operator||(const CGUISpriteInstance& fallback) const
|
||||
{
|
||||
if (*this)
|
||||
return *this;
|
||||
return fallback;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the sprite texture name.
|
||||
*/
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2020 Wildfire Games.
|
||||
/* Copyright (C) 2021 Wildfire Games.
|
||||
* This file is part of 0 A.D.
|
||||
*
|
||||
* 0 A.D. is free software: you can redistribute it and/or modify
|
||||
@ -144,13 +144,13 @@ void IGUIButtonBehavior::HandleMessage(SGUIMessage& Message)
|
||||
const CGUISpriteInstance& IGUIButtonBehavior::GetButtonSprite(const CGUISpriteInstance& sprite, const CGUISpriteInstance& sprite_over, const CGUISpriteInstance& sprite_pressed, const CGUISpriteInstance& sprite_disabled) const
|
||||
{
|
||||
if (!m_pObject.IsEnabled())
|
||||
return sprite_disabled || sprite;
|
||||
return sprite_disabled ? sprite_disabled : sprite;
|
||||
|
||||
if (!m_pObject.IsMouseHovering())
|
||||
return sprite;
|
||||
|
||||
if (m_Pressed)
|
||||
return sprite_pressed || sprite;
|
||||
return sprite_pressed ? sprite_pressed : sprite;
|
||||
|
||||
return sprite_over || sprite;
|
||||
return sprite_over ? sprite_over : sprite;
|
||||
}
|
||||
|
@ -453,15 +453,15 @@ void CDropDown::Draw()
|
||||
|
||||
if (!m_Enabled)
|
||||
{
|
||||
m_pGUI.DrawSprite(m_Sprite2Disabled || m_Sprite2, bz + 0.05f, rect);
|
||||
m_pGUI.DrawSprite(m_Sprite2Disabled ? m_Sprite2Disabled : m_Sprite2, bz + 0.05f, rect);
|
||||
}
|
||||
else if (m_Open)
|
||||
{
|
||||
m_pGUI.DrawSprite(m_Sprite2Pressed || m_Sprite2, bz + 0.05f, rect);
|
||||
m_pGUI.DrawSprite(m_Sprite2Pressed ? m_Sprite2Pressed : m_Sprite2, bz + 0.05f, rect);
|
||||
}
|
||||
else if (m_MouseHovering)
|
||||
{
|
||||
m_pGUI.DrawSprite(m_Sprite2Over || m_Sprite2, bz + 0.05f, rect);
|
||||
m_pGUI.DrawSprite(m_Sprite2Over ? m_Sprite2Over : m_Sprite2, bz + 0.05f, rect);
|
||||
}
|
||||
else
|
||||
m_pGUI.DrawSprite(m_Sprite2, bz + 0.05f, rect);
|
||||
|
Loading…
Reference in New Issue
Block a user