godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge 8233bab2c0 into 15ff450680

This commit is contained in:
Hugo Locurcio 2025-02-28 01:36:31 +01:00 committed by GitHub
parent 15ff450680 8233bab2c0
commit 7efbe51100
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/VisualShaderNodeCustom.xml
View File

@ -184,8 +184,8 @@
<method name="_is_highend" qualifiers="virtual const">
<return type="bool" />
<description>
Override this method to enable high-end mark in the Visual Shader Editor's members dialog.
Defining this method is [b]optional[/b]. If not overridden, it's [code]false[/code].
Override this method to enable the high-end mark in the Visual Shader Editor's members dialog. This should return [code]true[/code] for nodes that only work when using the Forward+ and Mobile rendering methods.
Defining this method is [b]optional[/b]. If not overridden, it's [code]false[/code], which indicates this node works with all rendering methods (including Compatibility).
</description>
</method>
<method name="get_option_index" qualifiers="const">

6
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -5191,7 +5191,7 @@ void VisualShaderEditor::_notification(int p_what) {
} break;
case NOTIFICATION_THEME_CHANGED: {
highend_label->set_modulate(get_theme_color(SNAME("highend_color"), EditorStringName(Editor)));
highend_label->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("warning_color"), EditorStringName(Editor)));
param_filter->set_right_icon(Control::get_editor_theme_icon(SNAME("Search")));
node_filter->set_right_icon(Control::get_editor_theme_icon(SNAME("Search")));
@ -6773,9 +6773,9 @@ VisualShaderEditor::VisualShaderEditor() {
highend_label = memnew(Label);
desc_hbox->add_child(highend_label);
highend_label->set_visible(false);
highend_label->set_text("Vulkan");
highend_label->set_text(TTRC("Forward+/Mobile"));
highend_label->set_mouse_filter(Control::MOUSE_FILTER_STOP);
highend_label->set_tooltip_text(TTR("High-end node"));
highend_label->set_tooltip_text(TTR("Only supported in the Forward+ and Mobile rendering methods, not Compatibility."));
node_desc = memnew(RichTextLabel);
members_vb->add_child(node_desc);

6
editor/themes/editor_theme_manager.cpp
View File

@ -544,12 +544,6 @@ void EditorThemeManager::_create_shared_styles(const Ref<EditorTheme> &p_theme,
p_theme->set_color("forward_plus_color", EditorStringName(Editor), Color::hex(0x5d8c3fff));
p_theme->set_color("mobile_color", EditorStringName(Editor), Color::hex(0xa5557dff));
p_theme->set_color("gl_compatibility_color", EditorStringName(Editor), Color::hex(0x5586a4ff));
if (p_config.dark_theme) {
p_theme->set_color("highend_color", EditorStringName(Editor), Color(1.0, 0.0, 0.0));
} else {
p_theme->set_color("highend_color", EditorStringName(Editor), Color::hex(0xad1128ff));
}
}
// Constants.