Commit 3eaea2d4 authored by bitplane's avatar bitplane

missed a couple of IGUIButton getters: isPushButton and isDrawingBorder

renamed getUseAlphaChannel to isAlphaChannelUsed to fit with other "bool is*" getters

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@657 dfc29bdd-3216-0410-991c-e03cc46cb475
parent e91b3f95
...@@ -99,7 +99,8 @@ GUI: ...@@ -99,7 +99,8 @@ GUI:
- Can now load/save gui environment from/to an element. - Can now load/save gui environment from/to an element.
- Most element set functions now have a corresponding get function - Most element set functions now have a corresponding get or is function.
(API change) IGUIButton::getUseAlphaChannel is now isAlphaChannelUsed, to fit with other is* functions.
- Fixed a bug with resizing the gui environment when the device is resized - Fixed a bug with resizing the gui environment when the device is resized
......
...@@ -116,10 +116,16 @@ namespace gui ...@@ -116,10 +116,16 @@ namespace gui
virtual void setUseAlphaChannel(bool useAlphaChannel) = 0; virtual void setUseAlphaChannel(bool useAlphaChannel) = 0;
//! Returns if the alpha channel should be used for drawing background images on the button //! Returns if the alpha channel should be used for drawing background images on the button
virtual bool getUseAlphaChannel() = 0; virtual bool isAlphaChannelUsed() = 0;
//! Sets if the button should use the skin to draw its border (default is true) //! Returns whether the button is a push button
virtual bool isPushButton() = 0;
//! Sets if the button should use the skin to draw its border and button face (default is true)
virtual void setDrawBorder(bool border) = 0; virtual void setDrawBorder(bool border) = 0;
//! Returns if the border and button face are being drawn using the skin
virtual bool isDrawingBorder() = 0;
}; };
......
...@@ -373,6 +373,13 @@ void CGUIButton::setPressed(bool pressed) ...@@ -373,6 +373,13 @@ void CGUIButton::setPressed(bool pressed)
} }
} }
//! Returns whether the button is a push button
bool CGUIButton::isPushButton()
{
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsPushButton;
}
//! Sets if the alpha channel should be used for drawing images on the button (default is false) //! Sets if the alpha channel should be used for drawing images on the button (default is false)
void CGUIButton::setUseAlphaChannel(bool useAlphaChannel) void CGUIButton::setUseAlphaChannel(bool useAlphaChannel)
{ {
...@@ -380,11 +387,18 @@ void CGUIButton::setUseAlphaChannel(bool useAlphaChannel) ...@@ -380,11 +387,18 @@ void CGUIButton::setUseAlphaChannel(bool useAlphaChannel)
} }
//! Returns if the alpha channel should be used for drawing images on the button //! Returns if the alpha channel should be used for drawing images on the button
bool CGUIButton::getUseAlphaChannel() bool CGUIButton::isAlphaChannelUsed()
{ {
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return UseAlphaChannel; return UseAlphaChannel;
} }
bool CGUIButton::isDrawingBorder()
{
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return Border;
}
//! Writes attributes of the element. //! Writes attributes of the element.
void CGUIButton::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) void CGUIButton::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0)
{ {
......
...@@ -76,7 +76,13 @@ namespace gui ...@@ -76,7 +76,13 @@ namespace gui
virtual void setUseAlphaChannel(bool useAlphaChannel); virtual void setUseAlphaChannel(bool useAlphaChannel);
//! Returns if the alpha channel should be used for drawing images on the button //! Returns if the alpha channel should be used for drawing images on the button
virtual bool getUseAlphaChannel(); virtual bool isAlphaChannelUsed();
//! Returns if the button face and border are being drawn
virtual bool isDrawingBorder();
//! Returns whether the button is a push button
virtual bool isPushButton();
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options); virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment