godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20535 from akien-mga/layers-tooltips 

Fix layer 2-line tooltips used as name in inspector
This commit is contained in:
Rémi Verschelde 2018-07-28 15:40:18 +02:00 committed by GitHub
parent 4e4702e386 578c8fc1e5
commit 31c67a0fa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/editor_properties.cpp
View File

@ -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() {