projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactored Item Layouts
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
shader-effects
/
nine-patch-mask-effect.cpp
diff --git
a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
b/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
index
d2b8967
..
c03537d
100644
(file)
--- a/
dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
+++ b/
dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-108,19
+108,19
@@
static void DoApply( ImageActor actor, const std::string& maskImage, const Vecto
void Apply( ImageActor actor, const std::string& maskImage )
{
void Apply( ImageActor actor, const std::string& maskImage )
{
-
Vector2
maskSize = ResourceImage::GetImageSize( maskImage );
+
const Uint16Pair
maskSize = ResourceImage::GetImageSize( maskImage );
- const float leftRight = (maskSize.
width
- 1.0f) * 0.5f;
- const float topBottom = (maskSize.
height
- 1.0f) * 0.5f;
+ const float leftRight = (maskSize.
GetWidth()
- 1.0f) * 0.5f;
+ const float topBottom = (maskSize.
GetHeight()
- 1.0f) * 0.5f;
- DoApply( actor, maskImage,
maskSize
, Vector4( leftRight, topBottom, leftRight, topBottom ) );
+ DoApply( actor, maskImage,
Vector2( maskSize.GetWidth(), maskSize.GetHeight() )
, Vector4( leftRight, topBottom, leftRight, topBottom ) );
}
void Apply( ImageActor actor, const std::string& maskImage, const Vector4& maskBorder )
{
}
void Apply( ImageActor actor, const std::string& maskImage, const Vector4& maskBorder )
{
-
Vector2
maskSize = ResourceImage::GetImageSize( maskImage );
+
const Uint16Pair
maskSize = ResourceImage::GetImageSize( maskImage );
- DoApply( actor, maskImage,
maskSize
, maskBorder );
+ DoApply( actor, maskImage,
Vector2( maskSize.GetWidth(), maskSize.GetHeight() )
, maskBorder );
}
} // namespace NinePatchMaskEffect
}
} // namespace NinePatchMaskEffect