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
Added new properties to make ScrollView more scriptable
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
buttons
/
button-impl.cpp
diff --git
a/dali-toolkit/internal/controls/buttons/button-impl.cpp
b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index
4548ac9
..
f8b0fb2
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/
dali-toolkit/internal/controls/buttons/button-impl.cpp
@@
-30,6
+30,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
/**
* Button states and contents
/**
* Button states and contents
@@
-574,18
+575,14
@@
const Vector4 Button::GetSelectedColor() const
void Button::SetUnselectedImage( const std::string& filename )
{
void Button::SetUnselectedImage( const std::string& filename )
{
-
ImageActor
newContent;
+
Toolkit::ImageView
newContent;
if( !filename.empty() )
{
if( !filename.empty() )
{
- Image resourceimage = Dali::ResourceImage::New( filename );
- if( resourceimage )
- {
- newContent = ImageActor::New( resourceimage );
- }
+ newContent = Toolkit::ImageView::New( filename );
}
else
{
}
else
{
- newContent =
ImageActor
::New();
+ newContent =
Toolkit::ImageView
::New();
}
if( newContent )
}
if( newContent )
@@
-606,18
+603,14
@@
Actor& Button::GetUnselectedImage()
void Button::SetSelectedImage( const std::string& filename )
{
void Button::SetSelectedImage( const std::string& filename )
{
-
ImageActor
newContent;
+
Toolkit::ImageView
newContent;
if( !filename.empty() )
{
if( !filename.empty() )
{
- Image resourceimage = Dali::ResourceImage::New( filename );
- if( resourceimage )
- {
- newContent = ImageActor::New( resourceimage );
- }
+ newContent = Toolkit::ImageView::New( filename );
}
else
{
}
else
{
- newContent =
ImageActor
::New();
+ newContent =
Toolkit::ImageView
::New();
}
if( newContent )
}
if( newContent )
@@
-638,14
+631,10
@@
Actor& Button::GetSelectedImage()
void Button::SetBackgroundImage( const std::string& filename )
{
void Button::SetBackgroundImage( const std::string& filename )
{
- Image resourceimage = Dali::ResourceImage::New( filename );
- if( resourceimage )
- {
- SetupContent( mBackgroundContent, ImageActor::New( resourceimage ) );
+ SetupContent( mBackgroundContent, Toolkit::ImageView::New( filename ) );
- OnBackgroundImageSet();
- RelayoutRequest();
- }
+ OnBackgroundImageSet();
+ RelayoutRequest();
}
Actor& Button::GetBackgroundImage()
}
Actor& Button::GetBackgroundImage()
@@
-655,14
+644,10
@@
Actor& Button::GetBackgroundImage()
void Button::SetSelectedBackgroundImage( const std::string& filename )
{
void Button::SetSelectedBackgroundImage( const std::string& filename )
{
- Image resourceimage = Dali::ResourceImage::New( filename );
- if( resourceimage )
- {
- SetupContent( mSelectedBackgroundContent, ImageActor::New( resourceimage ) );
+ SetupContent( mSelectedBackgroundContent, Toolkit::ImageView::New( filename ) );
- OnSelectedBackgroundImageSet();
- RelayoutRequest();
- }
+ OnSelectedBackgroundImageSet();
+ RelayoutRequest();
}
Actor& Button::GetSelectedBackgroundImage()
}
Actor& Button::GetSelectedBackgroundImage()
@@
-672,14
+657,10
@@
Actor& Button::GetSelectedBackgroundImage()
void Button::SetDisabledImage( const std::string& filename )
{
void Button::SetDisabledImage( const std::string& filename )
{
- Image resourceimage = Dali::ResourceImage::New( filename );
- if( resourceimage )
- {
- SetupContent( mDisabledContent, ImageActor::New( resourceimage ) );
+ SetupContent( mDisabledContent, Toolkit::ImageView::New( filename ) );
- OnDisabledImageSet();
- RelayoutRequest();
- }
+ OnDisabledImageSet();
+ RelayoutRequest();
}
Actor& Button::GetDisabledImage()
}
Actor& Button::GetDisabledImage()
@@
-689,14
+670,10
@@
Actor& Button::GetDisabledImage()
void Button::SetDisabledSelectedImage( const std::string& filename )
{
void Button::SetDisabledSelectedImage( const std::string& filename )
{
- Image resourceimage = Dali::ResourceImage::New( filename );
- if( resourceimage )
- {
- SetupContent( mDisabledSelectedContent, ImageActor::New( resourceimage ) );
+ SetupContent( mDisabledSelectedContent, Toolkit::ImageView::New( filename ) );
- OnDisabledSelectedImageSet();
- RelayoutRequest();
- }
+ OnDisabledSelectedImageSet();
+ RelayoutRequest();
}
Actor& Button::GetDisabledSelectedImage()
}
Actor& Button::GetDisabledSelectedImage()
@@
-706,14
+683,10
@@
Actor& Button::GetDisabledSelectedImage()
void Button::SetDisabledBackgroundImage( const std::string& filename )
{
void Button::SetDisabledBackgroundImage( const std::string& filename )
{
- Image resourceimage = Dali::ResourceImage::New( filename );
- if( resourceimage )
- {
- SetupContent( mDisabledBackgroundContent, ImageActor::New( resourceimage ) );
+ SetupContent( mDisabledBackgroundContent, Toolkit::ImageView::New( filename ) );
- OnDisabledBackgroundImageSet();
- RelayoutRequest();
- }
+ OnDisabledBackgroundImageSet();
+ RelayoutRequest();
}
Actor& Button::GetDisabledBackgroundImage()
}
Actor& Button::GetDisabledBackgroundImage()
@@
-1198,7
+1171,6
@@
void Button::PrepareAddButtonImage( Actor& actor )
{
if( actor )
{
{
if( actor )
{
- actor.Unparent();
Self().Add( actor );
PrepareForTranstionOut( actor );
}
Self().Add( actor );
PrepareForTranstionOut( actor );
}
@@
-1221,7
+1193,6
@@
void Button::AddButtonImage( Actor& actor )
{
if( actor )
{
{
if( actor )
{
- actor.Unparent();
Self().Add( actor );
}
}
Self().Add( actor );
}
}