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

Merge pull request #95285 from Calinou/codeedit-completion-color-background-translucent 

Draw a checkerboard behind translucent colors in CodeEdit autocompletion previews
This commit is contained in:
Rémi Verschelde 2024-08-27 22:27:49 +02:00
parent 1ead46e782 fb88658cc8
commit b4eacfe0ce
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/CodeEdit.xml
View File

@ -721,6 +721,9 @@
<theme_item name="can_fold_code_region" data_type="icon" type="Texture2D"> <theme_item name="can_fold_code_region" data_type="icon" type="Texture2D">
Sets a custom [Texture2D] to draw in the line folding gutter when a code region can be folded. Sets a custom [Texture2D] to draw in the line folding gutter when a code region can be folded.
</theme_item> </theme_item>
<theme_item name="completion_color_bg" data_type="icon" type="Texture2D">
Background panel for the color preview box in autocompletion (visible when the color is translucent).
</theme_item>
<theme_item name="executing_line" data_type="icon" type="Texture2D"> <theme_item name="executing_line" data_type="icon" type="Texture2D">
Icon to draw in the executing gutter for executing lines. Icon to draw in the executing gutter for executing lines.
</theme_item> </theme_item>

9
scene/gui/code_edit.cpp
View File

@ -211,7 +211,13 @@ void CodeEdit::_notification(int p_what) {
tl->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT); tl->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
} else { } else {
if (code_completion_options[l].default_value.get_type() == Variant::COLOR) { if (code_completion_options[l].default_value.get_type() == Variant::COLOR) {
draw_rect(Rect2(Point2(code_completion_rect.position.x + code_completion_rect.size.width - icon_area_size.x, icon_area.position.y), icon_area_size), (Color)code_completion_options[l].default_value); const Color color = code_completion_options[l].default_value;
const Rect2 rect = Rect2(Point2(code_completion_rect.position.x + code_completion_rect.size.width - icon_area_size.x, icon_area.position.y), icon_area_size);
if (color.a < 1.0) {
draw_texture_rect(theme_cache.completion_color_bg, rect, true);
}
draw_rect(rect, color);
} }
tl->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_LEFT); tl->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_LEFT);
} }
@ -2771,6 +2777,7 @@ void CodeEdit::_bind_methods() {
BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, CodeEdit, can_fold_code_region_icon, "can_fold_code_region"); BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, CodeEdit, can_fold_code_region_icon, "can_fold_code_region");
BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, CodeEdit, folded_code_region_icon, "folded_code_region"); BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, CodeEdit, folded_code_region_icon, "folded_code_region");
BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CodeEdit, folded_eol_icon); BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CodeEdit, folded_eol_icon);
BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CodeEdit, completion_color_bg);
BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, CodeEdit, breakpoint_color); BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, CodeEdit, breakpoint_color);
BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, CodeEdit, breakpoint_icon, "breakpoint"); BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, CodeEdit, breakpoint_icon, "breakpoint");

1
scene/gui/code_edit.h
View File

@ -245,6 +245,7 @@ private:
Ref<Texture2D> can_fold_code_region_icon; Ref<Texture2D> can_fold_code_region_icon;
Ref<Texture2D> folded_code_region_icon; Ref<Texture2D> folded_code_region_icon;
Ref<Texture2D> folded_eol_icon; Ref<Texture2D> folded_eol_icon;
Ref<Texture2D> completion_color_bg;
Color breakpoint_color = Color(1, 1, 1); Color breakpoint_color = Color(1, 1, 1);
Ref<Texture2D> breakpoint_icon = Ref<Texture2D>(); Ref<Texture2D> breakpoint_icon = Ref<Texture2D>();

1
scene/theme/default_theme.cpp
View File

@ -504,6 +504,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
theme->set_icon("can_fold_code_region", "CodeEdit", icons["region_unfolded"]); theme->set_icon("can_fold_code_region", "CodeEdit", icons["region_unfolded"]);
theme->set_icon("folded_code_region", "CodeEdit", icons["region_folded"]); theme->set_icon("folded_code_region", "CodeEdit", icons["region_folded"]);
theme->set_icon("folded_eol_icon", "CodeEdit", icons["text_edit_ellipsis"]); theme->set_icon("folded_eol_icon", "CodeEdit", icons["text_edit_ellipsis"]);
theme->set_icon("completion_color_bg", "CodeEdit", icons["mini_checkerboard"]);
theme->set_font(SceneStringName(font), "CodeEdit", Ref<Font>()); theme->set_font(SceneStringName(font), "CodeEdit", Ref<Font>());
theme->set_font_size(SceneStringName(font_size), "CodeEdit", -1); theme->set_font_size(SceneStringName(font_size), "CodeEdit", -1);