summaryrefslogtreecommitdiffstats
path: root/servers/display_server.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-05-01 09:54:44 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-05-01 09:54:44 +0200
commit85062e37efbba65b7bb7d191a53e5207df942b86 (patch)
tree97e7b005220f994ccb91d1437ea54aecdc9680f4 /servers/display_server.h
parente950d7ad36fd3527a2d0335d0a5e1f794a592255 (diff)
parent0587a1d217688437718eb3978915558920a637fb (diff)
downloadredot-engine-85062e37efbba65b7bb7d191a53e5207df942b86.tar.gz
Merge pull request #89588 from bruvzg/status_ind_menu_direct
[StatusIndicator] Switch API to use Texture2D instead of Image, improve handling on macOS, add method to set native popup menu directly.
Diffstat (limited to 'servers/display_server.h')
-rw-r--r--servers/display_server.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/servers/display_server.h b/servers/display_server.h
index aab51644c0..0391edecd4 100644
--- a/servers/display_server.h
+++ b/servers/display_server.h
@@ -564,9 +564,10 @@ public:
virtual void set_native_icon(const String &p_filename);
virtual void set_icon(const Ref<Image> &p_icon);
- virtual IndicatorID create_status_indicator(const Ref<Image> &p_icon, const String &p_tooltip, const Callable &p_callback);
- virtual void status_indicator_set_icon(IndicatorID p_id, const Ref<Image> &p_icon);
+ virtual IndicatorID create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback);
+ virtual void status_indicator_set_icon(IndicatorID p_id, const Ref<Texture2D> &p_icon);
virtual void status_indicator_set_tooltip(IndicatorID p_id, const String &p_tooltip);
+ virtual void status_indicator_set_menu(IndicatorID p_id, const RID &p_menu_rid);
virtual void status_indicator_set_callback(IndicatorID p_id, const Callable &p_callback);
virtual void delete_status_indicator(IndicatorID p_id);