From d517bc908f9c1e00503266ab9a639552660cf72c Mon Sep 17 00:00:00 2001
From: rdb
Date: Fri, 28 Oct 2016 10:52:57 +0200
Subject: Add "Never" underline mode to LinkButton
---
doc/base/classes.xml | 3 +++
scene/gui/link_button.cpp | 7 ++++---
scene/gui/link_button.h | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 5eb021f6c..13d2b8f61 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -20298,6 +20298,9 @@
The LinkButton will show an underline at the bottom of its text when the mouse cursor is over it.
+
+ The LinkButton will never show an underline at the bottom of its text.
+
diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp
index 62829fd5a..e6f85c593 100644
--- a/scene/gui/link_button.cpp
+++ b/scene/gui/link_button.cpp
@@ -87,13 +87,13 @@ void LinkButton::_notification(int p_what) {
else
color=get_color("font_color");
- do_underline=true;
+ do_underline=underline_mode!=UNDERLINE_MODE_NEVER;
} break;
case DRAW_HOVER: {
color=get_color("font_color_hover");
- do_underline=true;
+ do_underline=underline_mode!=UNDERLINE_MODE_NEVER;
} break;
case DRAW_DISABLED: {
@@ -139,9 +139,10 @@ void LinkButton::_bind_methods() {
BIND_CONSTANT( UNDERLINE_MODE_ALWAYS );
BIND_CONSTANT( UNDERLINE_MODE_ON_HOVER );
+ BIND_CONSTANT( UNDERLINE_MODE_NEVER );
ADD_PROPERTYNZ(PropertyInfo(Variant::STRING,"text"), _SCS("set_text"), _SCS("get_text"));
- ADD_PROPERTYNZ(PropertyInfo(Variant::INT,"underline",PROPERTY_HINT_ENUM,"Always,On Hover"), _SCS("set_underline_mode"), _SCS("get_underline_mode"));
+ ADD_PROPERTYNZ(PropertyInfo(Variant::INT,"underline",PROPERTY_HINT_ENUM,"Always,On Hover,Never"), _SCS("set_underline_mode"), _SCS("get_underline_mode"));
}
diff --git a/scene/gui/link_button.h b/scene/gui/link_button.h
index 9978f66cc..a44fc2ec1 100644
--- a/scene/gui/link_button.h
+++ b/scene/gui/link_button.h
@@ -40,7 +40,8 @@ public:
enum UnderlineMode {
UNDERLINE_MODE_ALWAYS,
- UNDERLINE_MODE_ON_HOVER
+ UNDERLINE_MODE_ON_HOVER,
+ UNDERLINE_MODE_NEVER
};
private:
String text;
--
cgit v1.2.3-70-g09d2