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
Change cursor parent from Layer to Actor
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
text-controls
/
text-selection-popup.cpp
diff --git
a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
index
4b9f548
..
9f92518
100644
(file)
--- a/
dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
+++ b/
dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
@@
-25,31
+25,27
@@
using namespace Dali;
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
-TextSelectionPopup TextSelectionPopup::New( Buttons enabledButtons,
- TextSelectionPopupCallbackInterface* callbackInterface )
+TextSelectionPopup TextSelectionPopup::New(TextSelectionPopupCallbackInterface* callbackInterface)
{
{
- return Internal::TextSelectionPopup::New( enabledButtons,
- callbackInterface );
+ return Internal::TextSelectionPopup::New(callbackInterface);
}
TextSelectionPopup::TextSelectionPopup()
{
}
}
TextSelectionPopup::TextSelectionPopup()
{
}
-TextSelectionPopup::TextSelectionPopup(
const TextSelectionPopup& handle
)
-: Control(
handle
)
+TextSelectionPopup::TextSelectionPopup(
const TextSelectionPopup& handle
)
+: Control(
handle
)
{
}
{
}
-TextSelectionPopup& TextSelectionPopup::operator=(
const TextSelectionPopup& handle
)
+TextSelectionPopup& TextSelectionPopup::operator=(
const TextSelectionPopup& handle
)
{
{
- if(
&handle != this
)
+ if(
&handle != this
)
{
{
- Control::operator=(
handle
);
+ Control::operator=(
handle
);
}
return *this;
}
}
return *this;
}
@@
-58,14
+54,19
@@
TextSelectionPopup::~TextSelectionPopup()
{
}
{
}
-TextSelectionPopup TextSelectionPopup::DownCast(
BaseHandle handle
)
+TextSelectionPopup TextSelectionPopup::DownCast(
BaseHandle handle
)
{
return Control::DownCast<TextSelectionPopup, Internal::TextSelectionPopup>(handle);
}
{
return Control::DownCast<TextSelectionPopup, Internal::TextSelectionPopup>(handle);
}
-void TextSelectionPopup::RaiseAbove( Layer target )
+void TextSelectionPopup::EnableButtons(Toolkit::TextSelectionPopup::Buttons buttonsToEnable)
+{
+ GetImpl(*this).EnableButtons(buttonsToEnable);
+}
+
+void TextSelectionPopup::RaiseAbove(Actor target)
{
{
- GetImpl(*this).RaiseAbove(
target
);
+ GetImpl(*this).RaiseAbove(
target
);
}
void TextSelectionPopup::ShowPopup()
}
void TextSelectionPopup::ShowPopup()
@@
-73,17
+74,21
@@
void TextSelectionPopup::ShowPopup()
GetImpl(*this).ShowPopup();
}
GetImpl(*this).ShowPopup();
}
-TextSelectionPopup::TextSelectionPopup( Internal::TextSelectionPopup& implementation )
-: Control(implementation)
+void TextSelectionPopup::HidePopup()
{
{
+ GetImpl(*this).HidePopup();
}
}
-TextSelectionPopup::TextSelectionPopup(
Dali::Internal::CustomActor* internal
)
-: Control(
internal
)
+TextSelectionPopup::TextSelectionPopup(
Internal::TextSelectionPopup& implementation
)
+: Control(
implementation
)
{
{
- VerifyCustomActorPointer<Internal::TextSelectionPopup>( internal );
}
}
+TextSelectionPopup::TextSelectionPopup(Dali::Internal::CustomActor* internal)
+: Control(internal)
+{
+ VerifyCustomActorPointer<Internal::TextSelectionPopup>(internal);
+}
} // namespace Toolkit
} // namespace Toolkit