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
Disable libintl code for non glibc builds.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-selection-popup-impl.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
index
babd0eb
..
8512a10
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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.
@@
-19,7
+19,9
@@
#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
// EXTERNAL INCLUDES
#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
// EXTERNAL INCLUDES
+#if defined(__GLIBC__)
#include <libintl.h>
#include <libintl.h>
+#endif
#include <string.h>
#include <cfloat>
#include <dali/public-api/animation/animation.h>
#include <string.h>
#include <cfloat>
#include <dali/public-api/animation/animation.h>
@@
-35,9
+37,10
@@
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
-#include <dali-toolkit/
devel
-api/visuals/text-visual-properties.h>
-#include <dali-toolkit/
devel-api/visuals/visual-properties-devel
.h>
+#include <dali-toolkit/
public
-api/visuals/text-visual-properties.h>
+#include <dali-toolkit/
public-api/visuals/visual-properties
.h>
#include <dali-toolkit/internal/helpers/color-conversion.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/internal/helpers/color-conversion.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
@@
-52,8
+55,9
@@
namespace Internal
namespace
{
namespace
{
-
+#if defined(__GLIBC__)
#define GET_LOCALE_TEXT(string) dgettext("dali-toolkit", string)
#define GET_LOCALE_TEXT(string) dgettext("dali-toolkit", string)
+#endif
const std::string TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME( "TextSelectionPopupButton" );
const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR( Dali::Vector4( 0.24f, 0.72f, 0.8f, 1.0f ) );
const std::string TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME( "TextSelectionPopupButton" );
const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR( Dali::Vector4( 0.24f, 0.72f, 0.8f, 1.0f ) );
@@
-352,7
+356,7
@@
Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I
case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER:
{
Property::Map map;
case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER:
{
Property::Map map;
- Toolkit::Visual::Base visual =
impl.GetVisual(
Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER );
+ Toolkit::Visual::Base visual =
DevelControl::GetVisual( impl,
Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER );
if( visual )
{
visual.CreatePropertyMap( map );
if( visual )
{
visual.CreatePropertyMap( map );
@@
-413,10
+417,6
@@
void TextSelectionPopup::OnInitialize()
Actor self = Self();
self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
self.SetProperty( Actor::Property::COLOR_ALPHA, 0.0f );
Actor self = Self();
self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
self.SetProperty( Actor::Property::COLOR_ALPHA, 0.0f );
-
- // The Popup Control background is a nine-patch image. We clip against this so the
- // contents are correctly clipped against the edges of the nine-patch.
- self.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
}
void TextSelectionPopup::HideAnimationFinished( Animation& animation )
}
void TextSelectionPopup::HideAnimationFinished( Animation& animation )
@@
-808,6
+808,7
@@
std::string TextSelectionPopup::GetPressedImage() const
// Whether to mirror the list of buttons (for right to left languages)
bool mirror = false;
// Whether to mirror the list of buttons (for right to left languages)
bool mirror = false;
+#if defined(__GLIBC__)
char* idsLtr = GET_LOCALE_TEXT( IDS_LTR.c_str() );
if( NULL != idsLtr )
{
char* idsLtr = GET_LOCALE_TEXT( IDS_LTR.c_str() );
if( NULL != idsLtr )
{
@@
-818,6
+819,7
@@
std::string TextSelectionPopup::GetPressedImage() const
std::reverse( mOrderListOfButtons.begin(), mOrderListOfButtons.end() );
}
}
std::reverse( mOrderListOfButtons.begin(), mOrderListOfButtons.end() );
}
}
+#endif
// Iterate list of buttons and add active ones to Toolbar
std::size_t numberOfOptionsRequired = GetNumberOfEnabledOptions();
// Iterate list of buttons and add active ones to Toolbar
std::size_t numberOfOptionsRequired = GetNumberOfEnabledOptions();
@@
-841,7
+843,7
@@
std::string TextSelectionPopup::GetPressedImage() const
void TextSelectionPopup::CreateBackgroundBorder( Property::Map& propertyMap )
{
// Removes previous image if necessary
void TextSelectionPopup::CreateBackgroundBorder( Property::Map& propertyMap )
{
// Removes previous image if necessary
-
UnregisterVisual(
Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER );
+
DevelControl::UnregisterVisual( *this,
Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER );
if( ! propertyMap.Empty() )
{
if( ! propertyMap.Empty() )
{
@@
-849,8
+851,7
@@
void TextSelectionPopup::CreateBackgroundBorder( Property::Map& propertyMap )
if( visual )
{
if( visual )
{
- RegisterVisual( Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER, visual );
- visual.SetDepthIndex( DepthIndex::CONTENT );
+ DevelControl::RegisterVisual( *this, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER, visual, DepthIndex::CONTENT );
}
}
}
}
}
}