diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-09 16:47:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-09 16:47:58 +0200 |
| commit | 0a38d5c8f7a75fe57795716235f6d990a0994104 (patch) | |
| tree | 1c67faac16fedd1476032b7e5b7697faa0217716 /editor | |
| parent | 25fd4edd2922e026976a20c495984c7c32ea8b5d (diff) | |
| parent | 051234e84ee8a3949da76c75fe050c1ca77d1845 (diff) | |
Merge pull request #43158 from nathanfranke/fix-gradient-and-draw-tile
Fix Gradient and Color Picker checkerboard, Fix tile parameter for CanvasItem.draw_texture_rect
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_themes.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 0d714065e3..08dd37bc73 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -1345,7 +1345,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_color("folder_icon_modulate", "FileDialog", (dark_theme ? Color(1, 1, 1) : Color(4.25, 4.25, 4.25)).lerp(accent_color, 0.7)); theme->set_color("files_disabled", "FileDialog", font_disabled_color); - // color picker + // ColorPicker theme->set_constant("margin", "ColorPicker", popup_margin_size); theme->set_constant("sv_width", "ColorPicker", 256 * EDSCALE); theme->set_constant("sv_height", "ColorPicker", 256 * EDSCALE); @@ -1358,6 +1358,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_icon("bar_arrow", "ColorPicker", theme->get_icon("ColorPickerBarArrow", "EditorIcons")); theme->set_icon("picker_cursor", "ColorPicker", theme->get_icon("PickerCursor", "EditorIcons")); + // ColorPickerButton theme->set_icon("bg", "ColorPickerButton", theme->get_icon("GuiMiniCheckerboard", "EditorIcons")); // Information on 3D viewport |