diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-20 17:15:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 17:15:03 +0200 |
| commit | 75e540ce7259adbe1b1d4b22f2444078953da494 (patch) | |
| tree | d8ed853606437b9ab7efc10d95d6d432a41585fe /core | |
| parent | 16f7ff1ee946cc04f03670fb66eeb24392d8384d (diff) | |
| parent | 661c9ece7cf167fd654a255ed80de0023ba171d9 (diff) | |
Merge pull request #21148 from akien-mga/placeholder_text_hint
Add PROPERTY_HINT_PLACEHOLDER_TEXT for String properties
Diffstat (limited to 'core')
| -rw-r--r-- | core/global_constants.cpp | 1 | ||||
| -rw-r--r-- | core/object.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/global_constants.cpp b/core/global_constants.cpp index 187813f9d0..962881e720 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -532,6 +532,7 @@ void register_global_constants() { BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_GLOBAL_DIR); BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_RESOURCE_TYPE); BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_MULTILINE_TEXT); + BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_PLACEHOLDER_TEXT); BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_COLOR_NO_ALPHA); BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_IMAGE_COMPRESS_LOSSY); BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_IMAGE_COMPRESS_LOSSLESS); diff --git a/core/object.h b/core/object.h index 8dc3426d1d..806cf8160c 100644 --- a/core/object.h +++ b/core/object.h @@ -71,6 +71,7 @@ enum PropertyHint { PROPERTY_HINT_GLOBAL_DIR, ///< a directory path must be passed PROPERTY_HINT_RESOURCE_TYPE, ///< a resource object type PROPERTY_HINT_MULTILINE_TEXT, ///< used for string properties that can contain multiple lines + PROPERTY_HINT_PLACEHOLDER_TEXT, ///< used to set a placeholder text for string properties PROPERTY_HINT_COLOR_NO_ALPHA, ///< used for ignoring alpha component when editing a color PROPERTY_HINT_IMAGE_COMPRESS_LOSSY, PROPERTY_HINT_IMAGE_COMPRESS_LOSSLESS, |