-
Notifications
You must be signed in to change notification settings - Fork 857
Vfx/fix/1315493 disable paste if not allowed #5597
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
julienamsellem
merged 6 commits into
master
from
vfx/fix/1315493-disable-paste-if-not-allowed
Sep 16, 2021
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
91a7ebb
Disable "Paste" option when trying to copy a block outside of a context
julienamsellem 11fe9bd
Add a paste context menu option for the context blocks
julienamsellem 2b0cd53
Fixed formatting issue
julienamsellem 5823e57
Merge branch 'master' into vfx/fix/1315493-disable-paste-if-not-allowed
julienamsellem 92b58aa
Updated changelog
julienamsellem a9ba2f2
Merge branch 'master' into vfx/fix/1315493-disable-paste-if-not-allowed
julienamsellem File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,6 +47,27 @@ public static void PasteBlocks(VFXViewController viewController, object data, VF | |
s_Instance.PasteBlocks(viewController, (data as SerializableGraph).operators, targetModelContext, targetIndex, blocksInTheSameOrder); | ||
} | ||
|
||
public static bool CanPaste(VFXView view, object data) | ||
{ | ||
try | ||
{ | ||
var serializableGraph = JsonUtility.FromJson<SerializableGraph>(data.ToString()); | ||
if (serializableGraph.blocksOnly) | ||
{ | ||
var selectedContexts = view.selection.OfType<VFXContextUI>(); | ||
var selectedBlocks = view.selection.OfType<VFXBlockUI>(); | ||
|
||
return selectedBlocks.Any() || selectedContexts.Count() == 1; | ||
} | ||
|
||
return true; | ||
} | ||
catch | ||
{ | ||
return false; | ||
} | ||
} | ||
|
||
void DoPaste(VFXViewController viewController, Vector2 center, object data, VFXView view, VFXGroupNodeController groupNode, List<VFXNodeController> nodesInTheSameOrder) | ||
{ | ||
SerializableGraph serializableGraph = (SerializableGraph)data; | ||
|
@@ -85,7 +106,7 @@ void PasteBlocks(VFXView view, ref SerializableGraph serializableGraph, List<VFX | |
} | ||
else | ||
{ | ||
Debug.LogError(m_BlockPasteError.text); | ||
Debug.LogWarning(m_BlockPasteError.text); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not a error, rather an action that is not allowed. But with my changes it should not happen anymore |
||
return; | ||
} | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the same check that is done when really doing the paste