Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-31 18:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix in relative layout margins.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Martín Lucas Golini
2017-07-24 15:11:42 -03:00
parent 98c5e91b96
commit 34651aaced
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/eepp/graphics/textureatlas.hpp
View File

@@ -23,14 +23,14 @@ class EE_API TextureAtlas : public ResourceManager<SubTexture> {
* @param TexId The texture id
* @param Name The texture name ( if any )
*/
SubTexture * add( const Uint32& TexId, const std::string& getName = "" );
SubTexture * add( const Uint32& TexId, const std::string& Name = "" );
/** Creates and add to the texture atlas a SubTexture of the indicated part of the texture.
* @param TexId The texture id
* @param SrcRect The texture part that will be used as the SubTexture.
* @param Name The texture name ( if any )
*/
SubTexture * add( const Uint32& TexId, const Rect& SrcRect, const std::string& getName = "" );
SubTexture * add( const Uint32& TexId, const Rect& SrcRect, const std::string& Name = "" );
/** Creates and add to the texture atlas a SubTexture of the indicated part of the texture.
* @param TexId The texture id
@@ -38,7 +38,7 @@ class EE_API TextureAtlas : public ResourceManager<SubTexture> {
* @param DestSize The destination size that the SubTexture will have when rendered.
* @param Name The texture name ( if any )
*/
SubTexture * add( const Uint32& TexId, const Rect& SrcRect, const Sizef& DestSize, const std::string& getName = "" );
SubTexture * add( const Uint32& TexId, const Rect& SrcRect, const Sizef& DestSize, const std::string& Name = "" );
/** Creates and add to the texture atlas a SubTexture of the indicated part of the texture.
* @param TexId The texture id
@@ -47,7 +47,7 @@ class EE_API TextureAtlas : public ResourceManager<SubTexture> {
* @param Offset The offset that will be added to the position passed when any Draw call is used.
* @param Name The texture name ( if any )
*/
SubTexture * add( const Uint32& TexId, const Rect& SrcRect, const Sizef& DestSize, const Vector2i& Offset, const std::string& getName = "" );
SubTexture * add( const Uint32& TexId, const Rect& SrcRect, const Sizef& DestSize, const Vector2i& Offset, const std::string& Name = "" );
/** @return The texture atlas name. */
const std::string& getName() const;

2
src/eepp/ui/uirelativelayout.cpp
View File

@@ -111,7 +111,7 @@ void UIRelativeLayout::fixChildPos( UIWidget * widget ) {
break;
case UI_VALIGN_TOP:
default:
pos.y = widget->getLayoutMargin().Left;
pos.y = widget->getLayoutMargin().Top;
break;
}
}