Skip to content

Commit b4eacfe

Browse files
committed
Merge pull request #95285 from Calinou/codeedit-completion-color-background-translucent
Draw a checkerboard behind translucent colors in CodeEdit autocompletion previews
2 parents 1ead46e + fb88658 commit b4eacfe

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

doc/classes/CodeEdit.xml

+3
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,9 @@
721721
<theme_item name="can_fold_code_region" data_type="icon" type="Texture2D">
722722
Sets a custom [Texture2D] to draw in the line folding gutter when a code region can be folded.
723723
</theme_item>
724+
<theme_item name="completion_color_bg" data_type="icon" type="Texture2D">
725+
Background panel for the color preview box in autocompletion (visible when the color is translucent).
726+
</theme_item>
724727
<theme_item name="executing_line" data_type="icon" type="Texture2D">
725728
Icon to draw in the executing gutter for executing lines.
726729
</theme_item>

scene/gui/code_edit.cpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,13 @@ void CodeEdit::_notification(int p_what) {
211211
tl->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
212212
} else {
213213
if (code_completion_options[l].default_value.get_type() == Variant::COLOR) {
214-
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);
214+
const Color color = code_completion_options[l].default_value;
215+
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);
216+
if (color.a < 1.0) {
217+
draw_texture_rect(theme_cache.completion_color_bg, rect, true);
218+
}
219+
220+
draw_rect(rect, color);
215221
}
216222
tl->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_LEFT);
217223
}
@@ -2771,6 +2777,7 @@ void CodeEdit::_bind_methods() {
27712777
BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, CodeEdit, can_fold_code_region_icon, "can_fold_code_region");
27722778
BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, CodeEdit, folded_code_region_icon, "folded_code_region");
27732779
BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CodeEdit, folded_eol_icon);
2780+
BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CodeEdit, completion_color_bg);
27742781

27752782
BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, CodeEdit, breakpoint_color);
27762783
BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, CodeEdit, breakpoint_icon, "breakpoint");

scene/gui/code_edit.h

+1
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ class CodeEdit : public TextEdit {
245245
Ref<Texture2D> can_fold_code_region_icon;
246246
Ref<Texture2D> folded_code_region_icon;
247247
Ref<Texture2D> folded_eol_icon;
248+
Ref<Texture2D> completion_color_bg;
248249

249250
Color breakpoint_color = Color(1, 1, 1);
250251
Ref<Texture2D> breakpoint_icon = Ref<Texture2D>();

scene/theme/default_theme.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
504504
theme->set_icon("can_fold_code_region", "CodeEdit", icons["region_unfolded"]);
505505
theme->set_icon("folded_code_region", "CodeEdit", icons["region_folded"]);
506506
theme->set_icon("folded_eol_icon", "CodeEdit", icons["text_edit_ellipsis"]);
507+
theme->set_icon("completion_color_bg", "CodeEdit", icons["mini_checkerboard"]);
507508

508509
theme->set_font(SceneStringName(font), "CodeEdit", Ref<Font>());
509510
theme->set_font_size(SceneStringName(font_size), "CodeEdit", -1);

0 commit comments

Comments
 (0)