Merge with upstream #9
Merged
Conversation
This file contains 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
* disabling graph tools in segmentation tab if the graph source supplies its own tab * updated graphene merge tool to be able to queue up multiple merges, bulk submit, and visualize the pending merges as line segments * fixed adding graphene merge via 3d by disabling the pick buffer when the graphene merge line tool has an inProgressAnnotation
…ent starred Also ensures that adding a segment to visibleSegments automatically adds it to selectedSegments.
…tially hidden Previously, if the viewport was initially hidden when the list was rendered, the size estimates would all be zero, and these estimates would not corrected be when the viewport became visible, leading to incorrect positioning.
…ent list Previously, the array update operations assumed the starred segment list was sorted by segment id, which led to incorrect scroll position handling.
Also add indeterminate states for star and eye icon, and additional visibility/star toggle mouse bindings.
…click0) This complements the "select" command.
…google#463) * removed status messages that are already covered by that merge tool ui also fixed bug where an error object was being attached to a merge object instead of just the error message * minor formatting fixes * added shortcut for multicut submit and increased height of multicut buttons * added clear button for graphene merge tool
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge upstream's commit google@c6e6da5 into this fork so that we can change
c'toc^without errors. Specifically, this is the patch we need: google@400cd01