Skip to content
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

fix(whiteboard): text annotations stuck as fake and re-adds right click to cancel #15619

Merged
merged 3 commits into from
Nov 10, 2022

Conversation

Arthurk12
Copy link
Collaborator

What does this PR do?

First, this PR reverts 74c4c1c because it causes fake annotations from the text tool not to be removed. Since the text tool is the only one that generates fake annotations(because it is the only one that is live synced), the function to clear fake annotations is directly intended to clear them.
Also this PR fixes 2 issues that are extremelly related:

  • text annotations being stuck as fake
    Cleans up and modifies the added annotation handler to suit only for text annotation. As soon as the DRAW_END message is sent, the local fake annotations are removed and replaced by the complete/not fake annotation.
  • right click to cancel annotation not working
    Re-adds cancelling text annotation on right click. To achieve this, some mechanisms that were previously used to handle live synced annotations were rescued. So this partially reverts 40b18b0.

Closes Issue(s)

Closes #15595
Closes #15458

This reverts commit 74c4c1c.
Reverting this commit because it causes fake annotations from the text
tool not to be removed. Since the text tool is the only one that
generates fake annotations(because it is the only one that is live
synced), the function to clear fake annotations is directly intended to
clear them.
@antobinary antobinary added this to the Release 2.5 milestone Aug 30, 2022
Cleans up and modifies the added annotation handler to suit only for text
annotation. As soon as the DRAW_END message is sent, the local fake
annotations are removed and replaced by the complete/not fake annotation.
Re-adds cancelling text annotation on right click. To achieve this,
some mechanisms that were previously used to handle live synced annotations
were rescued. So this partially reverts 40b18b0.
@sonarcloud
Copy link

sonarcloud bot commented Sep 1, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug C 3 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@ramonlsouza ramonlsouza merged commit c97af6a into bigbluebutton:v2.5.x-release Nov 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants