#include <dali/integration-api/events/touch-event-integ.h>
#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
- pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap );
+ pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap );
tet_infoline(" UNSELECTED_VISUAL Added to button\n");
Property::Map propertyMap2;
propertyMap2.Insert(Visual::Property::TYPE, Visual::COLOR);
propertyMap2.Insert(ColorVisual::Property::MIX_COLOR, Color::RED);
- pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, propertyMap2 );
+ pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, propertyMap2 );
tet_printf("Added UNSELECTED_VISUAL and add button back to Stage\n");
colorMap.Insert(Visual::Property::TYPE, BROKEN_VISUAL_TYPE);
colorMap.Insert(BorderVisual::Property::COLOR, Color::BLUE);
colorMap.Insert(BorderVisual::Property::SIZE, 5.f);
- pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, colorMap );
+ pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, colorMap );
Stage::GetCurrent().Add( pushButton );
application.SendNotification();
bool horizontalAlignment = mTextLabelAlignment == BEGIN || mTextLabelAlignment == END; // label and visual side by side
// Get natural size of foreground ( largest of the possible visuals )
- Size largestForegroundVisual;
+ Size largestProvidedVisual;
Size labelSize = Size::ZERO;
- for ( int state = Button::UNSELECTED_STATE; state < Button::STATE_COUNT; state++)
+ bool foreGroundVisualUsed = false;
+
+ for ( int state = Button::UNSELECTED_STATE; state < Button::STATE_COUNT; state++ )
{
Toolkit::Visual::Base visual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[state][FOREGROUND] );
Size visualSize;
if ( visual )
{
visual.GetNaturalSize( visualSize );
- largestForegroundVisual.width = std::max(largestForegroundVisual.width, visualSize.width );
- largestForegroundVisual.height = std::max(largestForegroundVisual.height, visualSize.height );
+ largestProvidedVisual.width = std::max(largestProvidedVisual.width, visualSize.width );
+ largestProvidedVisual.height = std::max(largestProvidedVisual.height, visualSize.height );
+ foreGroundVisualUsed = true;
+ }
+ }
+
+ if ( !foreGroundVisualUsed ) // If foreground visual not supplied then use the background visual to calculate Natural size
+ {
+ for ( int state = Button::UNSELECTED_STATE; state < Button::STATE_COUNT; state++ )
+ {
+ Toolkit::Visual::Base visual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[state][BACKGROUND] );
+ Size visualSize;
+ if ( visual )
+ {
+ visual.GetNaturalSize( visualSize );
+ largestProvidedVisual.width = std::max(largestProvidedVisual.width, visualSize.width );
+ largestProvidedVisual.height = std::max(largestProvidedVisual.height, visualSize.height );
+ }
}
}
// Get horizontal padding total
- if ( largestForegroundVisual.width > 0 ) // if visual exists
+ if ( largestProvidedVisual.width > 0 ) // if visual exists
{
- size.width += largestForegroundVisual.width + mForegroundPadding.left + mForegroundPadding.right;
+ size.width += largestProvidedVisual.width + mForegroundPadding.left + mForegroundPadding.right;
}
// Get vertical padding total
- if ( largestForegroundVisual.height > 0 )
+ if ( largestProvidedVisual.height > 0 )
{
- size.height += largestForegroundVisual.height + mForegroundPadding.top + mForegroundPadding.bottom;
+ size.height += largestProvidedVisual.height + mForegroundPadding.top + mForegroundPadding.bottom;
}
DALI_LOG_INFO( gLogButtonFilter, Debug::General, "GetNaturalSize visual Size(%f,%f)\n",
- largestForegroundVisual.width, largestForegroundVisual.height );
+ largestProvidedVisual.width, largestProvidedVisual.height );
// Get natural size of label if text has been set
if ( mTextStringSetFlag )
case Toolkit::Button::Property::UNSELECTED_STATE_IMAGE: // Legacy Tizen 3.0
{
- GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, value, DepthIndex::CONTENT );
+ GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, value, DepthIndex::BACKGROUND );
break;
}
case Toolkit::Button::Property::DISABLED_STATE_IMAGE: // Legacy Tizen 3.0
{
- GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL, value, DepthIndex::CONTENT );
+ GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, value, DepthIndex::BACKGROUND );
break;
}
case Toolkit::Button::Property::SELECTED_STATE_IMAGE: // Legacy Tizen 3.0
{
- GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::SELECTED_VISUAL, value, DepthIndex::CONTENT );
+ GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, value, DepthIndex::BACKGROUND );
break;
}
case Toolkit::DevelButton::Property::UNSELECTED_VISUAL:
case Toolkit::Button::Property::UNSELECTED_STATE_IMAGE:
{
- value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::UNSELECTED_VISUAL );
+ value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL );
break;
}
case Toolkit::Button::Property::SELECTED_STATE_IMAGE:
{
- value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::SELECTED_VISUAL );
+ value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL );
break;
}
case Toolkit::Button::Property::DISABLED_STATE_IMAGE:
{
- value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL );
+ value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL );
break;
}
void Button::SetUnselectedImage( const std::string& filename )
{
- if( !filename.empty() )
- {
- CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, filename, DepthIndex::CONTENT );
- }
+ SetBackgroundImage( filename );
}
void Button::SetBackgroundImage( const std::string& filename )
{
CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND );
}
+ else
+ {
+ UnregisterVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL );
+ }
}
void Button::SetSelectedImage( const std::string& filename )
{
- if( !filename.empty() )
- {
- CreateVisualsForComponent( Toolkit::DevelButton::Property::SELECTED_VISUAL, filename, DepthIndex::CONTENT );
- }
+ SetSelectedBackgroundImage( filename );
}
void Button::SetSelectedBackgroundImage( const std::string& filename )
{
CreateVisualsForComponent( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND );
}
+ else
+ {
+ UnregisterVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL );
+ }
}
void Button::SetDisabledBackgroundImage( const std::string& filename )
Actor Button::GetButtonImage() const
{
DALI_LOG_WARNING("Button::GetButtonImage @DEPRECATED_1_0.50\n");
- Actor imageView = Toolkit::ImageView::New( GetUrlForImageVisual( Toolkit::DevelButton::Property::UNSELECTED_VISUAL ) );
+ Actor imageView = Toolkit::ImageView::New( GetUrlForImageVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ) );
return imageView;
}
Actor Button::GetSelectedImage() const
{
DALI_LOG_WARNING("Button::GetSelectedImage @DEPRECATED_1_0.50\n");
- Actor imageView = Toolkit::ImageView::New( GetUrlForImageVisual( Toolkit::DevelButton::Property::SELECTED_VISUAL ) );
+ Actor imageView = Toolkit::ImageView::New( GetUrlForImageVisual( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL ) );
return imageView;
}