|
@@ -46,6 +46,7 @@
|
|
|
#include "scene/gui/control.h"
|
|
|
#include "scene/gui/label.h"
|
|
|
#include "scene/gui/popup.h"
|
|
|
+#include "scene/gui/popup_menu.h"
|
|
|
#include "scene/main/canvas_layer.h"
|
|
|
#include "scene/main/window.h"
|
|
|
#include "scene/resources/mesh.h"
|
|
@@ -1101,6 +1102,12 @@ String Viewport::_gui_get_tooltip(Control *p_control, const Vector2 &p_pos, Cont
|
|
|
while (p_control) {
|
|
|
tooltip = p_control->get_tooltip(pos);
|
|
|
|
|
|
+ //Temporary solution for PopupMenus
|
|
|
+ PopupMenu *menu = Object::cast_to<PopupMenu>(this);
|
|
|
+ if (menu) {
|
|
|
+ tooltip = menu->get_tooltip(pos);
|
|
|
+ }
|
|
|
+
|
|
|
if (r_tooltip_owner) {
|
|
|
*r_tooltip_owner = p_control;
|
|
|
}
|