summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-07-28 10:27:19 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-07-28 10:27:19 +0200
commit578c8fc1e53f1c27a6ff976a5bcd2ceab2146e0a (patch)
treedb6c98c960cf23288b44277b6f7c91ce77e468bb
parent4488bb995683c381db78b7ec76d563be92762d6c (diff)
Fix layer 2-line tooltips used as name in inspector
Fixes #20288.
-rw-r--r--editor/editor_properties.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index 4fae8467b4..79490f1c8e 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -568,6 +568,7 @@ public:
uint32_t value;
Vector<Rect2> flag_rects;
Vector<String> names;
+ Vector<String> tooltips;
virtual Size2 get_minimum_size() const {
Ref<Font> font = get_font("font", "Label");
@@ -576,8 +577,8 @@ public:
virtual String get_tooltip(const Point2 &p_pos) const {
for (int i = 0; i < flag_rects.size(); i++) {
- if (i < names.size() && flag_rects[i].has_point(p_pos)) {
- return names[i];
+ if (i < tooltips.size() && flag_rects[i].has_point(p_pos)) {
+ return tooltips[i];
}
}
return String();
@@ -681,6 +682,7 @@ void EditorPropertyLayers::setup(LayerType p_layer_type) {
}
Vector<String> names;
+ Vector<String> tooltips;
for (int i = 0; i < 20; i++) {
String name;
@@ -692,12 +694,12 @@ void EditorPropertyLayers::setup(LayerType p_layer_type) {
name = TTR("Layer") + " " + itos(i + 1);
}
- name += "\n" + vformat(TTR("Bit %d, value %d"), i, 1 << i);
-
names.push_back(name);
+ tooltips.push_back(name + "\n" + vformat(TTR("Bit %d, value %d"), i, 1 << i));
}
grid->names = names;
+ grid->tooltips = tooltips;
}
void EditorPropertyLayers::_button_pressed() {