asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #90815 from KoBeWi/2_objects_1_editor

Browse source 
Avoid double editing when clicking AnimatedSprite
This commit is contained in:
Rémi Verschelde 2024-04-18 12:24:53 +02:00
commit f6ba06a8d7
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/plugins/sprite_frames_editor_plugin.cpp
View file

@ -1476,6 +1476,10 @@ void SpriteFramesEditor::edit(Ref<SpriteFrames> p_frames) {
_fetch_sprite_node(); // Fetch node after set frames.
}
bool SpriteFramesEditor::is_editing() const {
return frames.is_valid();
}
Variant SpriteFramesEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
if (read_only) {
return false;
@ -2325,7 +2329,7 @@ bool SpriteFramesEditorPlugin::handles(Object *p_object) const {
if (animated_sprite_3d && *animated_sprite_3d->get_sprite_frames()) {
return true;
}
return p_object->is_class("SpriteFrames");
return !frames_editor->is_editing() && Object::cast_to<SpriteFrames>(p_object);
}
void SpriteFramesEditorPlugin::make_visible(bool p_visible) {

3
editor/plugins/sprite_frames_editor_plugin.h
View file

@ -253,7 +253,6 @@ class SpriteFramesEditor : public HSplitContainer {
void _update_show_settings();
void _edit();
void _regist_scene_undo(EditorUndoRedoManager *undo_redo);
void _fetch_sprite_node();
void _remove_sprite_node();
@ -270,6 +269,8 @@ protected:
public:
void edit(Ref<SpriteFrames> p_frames);
bool is_editing() const;
SpriteFramesEditor();
};