summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editor/plugins/sprite_frames_editor_plugin.cpp2
-rw-r--r--modules/gdscript/gdscript_parser.cpp2
-rw-r--r--scene/gui/color_picker.cpp95
-rw-r--r--scene/gui/color_picker.h10
4 files changed, 79 insertions, 30 deletions
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp
index 9ff9b521d6..563398e512 100644
--- a/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -1866,6 +1866,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
frame_list = memnew(ItemList);
frame_list->set_v_size_flags(SIZE_EXPAND_FILL);
frame_list->set_icon_mode(ItemList::ICON_MODE_TOP);
+ frame_list->set_texture_filter(TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
frame_list->set_max_columns(0);
frame_list->set_icon_mode(ItemList::ICON_MODE_TOP);
@@ -1990,6 +1991,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
split_sheet_preview = memnew(TextureRect);
split_sheet_preview->set_expand_mode(TextureRect::EXPAND_IGNORE_SIZE);
+ split_sheet_preview->set_texture_filter(TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
split_sheet_preview->set_mouse_filter(MOUSE_FILTER_PASS);
split_sheet_preview->connect("draw", callable_mp(this, &SpriteFramesEditor::_sheet_preview_draw));
split_sheet_preview->connect("gui_input", callable_mp(this, &SpriteFramesEditor::_sheet_preview_input));
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 3bce258072..fdbd505975 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -4192,7 +4192,7 @@ String GDScriptParser::DataType::to_string() const {
return class_type->fqcn;
case SCRIPT: {
if (is_meta_type) {
- return script_type->get_class_name().operator String();
+ return script_type != nullptr ? script_type->get_class_name().operator String() : "";
}
String name = script_type != nullptr ? script_type->get_name() : "";
if (!name.is_empty()) {
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 5e861ba45d..f79557aded 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -109,6 +109,13 @@ void ColorPicker::_notification(int p_what) {
picker_window->hide();
}
} break;
+
+ case NOTIFICATION_INTERNAL_PROCESS: {
+ if (!is_picking_color) {
+ return;
+ }
+ set_pick_color(DisplayServer::get_singleton()->screen_get_pixel(DisplayServer::get_singleton()->mouse_get_position()));
+ }
}
}
@@ -1421,30 +1428,6 @@ void ColorPicker::_recent_preset_pressed(const bool p_pressed, ColorPresetButton
emit_signal(SNAME("color_changed"), p_preset->get_preset_color());
}
-void ColorPicker::_picker_texture_input(const Ref<InputEvent> &p_event) {
- if (!is_inside_tree()) {
- return;
- }
-
- Ref<InputEventMouseButton> bev = p_event;
- if (bev.is_valid() && bev->get_button_index() == MouseButton::LEFT && !bev->is_pressed()) {
- set_pick_color(picker_color);
- emit_signal(SNAME("color_changed"), color);
- picker_window->hide();
- }
-
- Ref<InputEventMouseMotion> mev = p_event;
- if (mev.is_valid()) {
- Ref<Image> img = picker_texture_rect->get_texture()->get_image();
- if (img.is_valid() && !img->is_empty()) {
- Vector2 ofs = mev->get_position();
- picker_color = img->get_pixel(ofs.x, ofs.y);
- picker_preview_style_box->set_bg_color(picker_color);
- picker_preview_label->set_self_modulate(picker_color.get_luminance() < 0.5 ? Color(1.0f, 1.0f, 1.0f) : Color(0.0f, 0.0f, 0.0f));
- }
- }
-}
-
void ColorPicker::_text_changed(const String &) {
text_changed = true;
}
@@ -1455,6 +1438,34 @@ void ColorPicker::_add_preset_pressed() {
}
void ColorPicker::_pick_button_pressed() {
+ is_picking_color = true;
+ set_process_internal(true);
+
+ if (!picker_window) {
+ picker_window = memnew(Popup);
+ picker_window->set_size(Vector2i(1, 1));
+ picker_window->connect("visibility_changed", callable_mp(this, &ColorPicker::_pick_finished));
+ add_child(picker_window);
+ }
+ picker_window->popup();
+}
+
+void ColorPicker::_pick_finished() {
+ if (picker_window->is_visible()) {
+ return;
+ }
+
+ if (Input::get_singleton()->is_key_pressed(Key::ESCAPE)) {
+ set_pick_color(old_color);
+ } else {
+ emit_signal(SNAME("color_changed"), color);
+ }
+ is_picking_color = false;
+ set_process_internal(false);
+ picker_window->hide();
+}
+
+void ColorPicker::_pick_button_pressed_legacy() {
if (!is_inside_tree()) {
return;
}
@@ -1469,7 +1480,7 @@ void ColorPicker::_pick_button_pressed() {
picker_texture_rect->set_anchors_preset(Control::PRESET_FULL_RECT);
picker_window->add_child(picker_texture_rect);
picker_texture_rect->set_default_cursor_shape(CURSOR_POINTING_HAND);
- picker_texture_rect->connect(SNAME("gui_input"), callable_mp(this, &ColorPicker::_picker_texture_input));
+ picker_texture_rect->connect("gui_input", callable_mp(this, &ColorPicker::_picker_texture_input));
picker_preview = memnew(Panel);
picker_preview->set_anchors_preset(Control::PRESET_CENTER_TOP);
@@ -1529,6 +1540,30 @@ void ColorPicker::_pick_button_pressed() {
picker_window->popup();
}
+void ColorPicker::_picker_texture_input(const Ref<InputEvent> &p_event) {
+ if (!is_inside_tree()) {
+ return;
+ }
+
+ Ref<InputEventMouseButton> bev = p_event;
+ if (bev.is_valid() && bev->get_button_index() == MouseButton::LEFT && !bev->is_pressed()) {
+ set_pick_color(picker_color);
+ emit_signal(SNAME("color_changed"), color);
+ picker_window->hide();
+ }
+
+ Ref<InputEventMouseMotion> mev = p_event;
+ if (mev.is_valid()) {
+ Ref<Image> img = picker_texture_rect->get_texture()->get_image();
+ if (img.is_valid() && !img->is_empty()) {
+ Vector2 ofs = mev->get_position();
+ picker_color = img->get_pixel(ofs.x, ofs.y);
+ picker_preview_style_box->set_bg_color(picker_color);
+ picker_preview_label->set_self_modulate(picker_color.get_luminance() < 0.5 ? Color(1.0f, 1.0f, 1.0f) : Color(0.0f, 0.0f, 0.0f));
+ }
+ }
+}
+
void ColorPicker::_html_focus_exit() {
if (c_text->is_menu_visible()) {
return;
@@ -1692,8 +1727,14 @@ ColorPicker::ColorPicker() {
btn_pick = memnew(Button);
sample_hbc->add_child(btn_pick);
- btn_pick->set_tooltip_text(RTR("Pick a color from the application window."));
- btn_pick->connect(SNAME("pressed"), callable_mp(this, &ColorPicker::_pick_button_pressed));
+ if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SCREEN_CAPTURE)) {
+ btn_pick->set_tooltip_text(RTR("Pick a color from the screen."));
+ btn_pick->connect(SNAME("pressed"), callable_mp(this, &ColorPicker::_pick_button_pressed));
+ } else {
+ // On unsupported platforms, use a legacy method for color picking.
+ btn_pick->set_tooltip_text(RTR("Pick a color from the application window."));
+ btn_pick->connect(SNAME("pressed"), callable_mp(this, &ColorPicker::_pick_button_pressed_legacy));
+ }
sample = memnew(TextureRect);
sample_hbc->add_child(sample);
diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h
index 018ae10955..711a371688 100644
--- a/scene/gui/color_picker.h
+++ b/scene/gui/color_picker.h
@@ -122,11 +122,13 @@ private:
Vector<ColorMode *> modes;
Popup *picker_window = nullptr;
+ // Legacy color picking.
TextureRect *picker_texture_rect = nullptr;
Panel *picker_preview = nullptr;
Label *picker_preview_label = nullptr;
Ref<StyleBoxFlat> picker_preview_style_box;
Color picker_color;
+
Control *uv_edit = nullptr;
Control *w_edit = nullptr;
AspectRatioContainer *wheel_edit = nullptr;
@@ -183,6 +185,7 @@ private:
Color color;
Color old_color;
+ bool is_picking_color = false;
bool display_old_color = false;
bool deferred_mode_enabled = false;
@@ -259,11 +262,14 @@ private:
void _line_edit_input(const Ref<InputEvent> &p_event);
void _preset_input(const Ref<InputEvent> &p_event, const Color &p_color);
void _recent_preset_pressed(const bool pressed, ColorPresetButton *p_preset);
- void _picker_texture_input(const Ref<InputEvent> &p_event);
void _text_changed(const String &p_new_text);
void _add_preset_pressed();
- void _pick_button_pressed();
void _html_focus_exit();
+ void _pick_button_pressed();
+ void _pick_finished();
+ // Legacy color picking.
+ void _pick_button_pressed_legacy();
+ void _picker_texture_input(const Ref<InputEvent> &p_event);
inline int _get_preset_size();
void _add_preset_button(int p_size, const Color &p_color);