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.

Sign up for GitHub

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

Jump to bottom

[Editor] Change the cursors for highlighting (bug 1876588) #17581

Merged
merged 1 commit into from
Jan 26, 2024
Merged

[Editor] Change the cursors for highlighting (bug 1876588) #17581

merged 1 commit into from
Jan 26, 2024

Conversation

calixteman
Copy link
Contributor

No description provided.

@calixteman
Copy link
Contributor Author

/botio-linux preview

@moz-tools-bot
Copy link
Collaborator

From: Bot.io (Linux m4)

Received

Command cmd_preview from @calixteman received. Current queue size: 0

Live output at: http://54.241.84.105:8877/4c5b8eb2e19d281/output.txt

@moz-tools-bot
Copy link
Collaborator

From: Bot.io (Linux m4)

Success

Full output at http://54.241.84.105:8877/4c5b8eb2e19d281/output.txt

Total script time: 1.24 mins

Published

@calixteman calixteman force-pushed the editor_highlight_cursor branch 2 times, most recently from c03ae14 to 82476cc Compare January 25, 2024 18:17
@calixteman calixteman marked this pull request as ready for review January 25, 2024 18:17
@calixteman calixteman changed the title [Editor] Change the cursors for highlighting [Editor] Change the cursors for highlighting (bug 1876588) Jan 25, 2024
Snuffleupagus
Snuffleupagus requested changes Jan 26, 2024
View reviewed changes
Copy link
Collaborator

@Snuffleupagus Snuffleupagus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As-is this patch will cause issues in the standalone viewer-components (and likely lead to user complaints). Please update

pdf.js/gulpfile.mjs

Lines 1087 to 1093 in 4ec4348

const COMPONENTS_IMAGES = [
"web/images/annotation-*.svg",
"web/images/loading-icon.gif",
"web/images/altText_*.svg",
"web/images/editor-toolbar-*.svg",
"web/images/toolbarButton-menuArrow.svg",
];
to also include:

  • "web/images/cursor-*.svg"
  • "web/images/toolbarButton-editorHighlight.svg",

web/annotation_editor_layer_builder.css Outdated Show resolved Hide resolved
web/images/cursor-editor-texthighlight.svg Outdated Show resolved Hide resolved
@calixteman calixteman force-pushed the editor_highlight_cursor branch from 82476cc to 13afb81 Compare January 26, 2024 17:01
Snuffleupagus
Snuffleupagus approved these changes Jan 26, 2024
View reviewed changes
Copy link
Collaborator

@Snuffleupagus Snuffleupagus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that we bundle the cursor-*.svg files even in the viewer-components, I think that we could simplify some existing CSS rules in this file. Hence we can change:

  • pdf.js/web/annotation_editor_layer_builder.css

    Lines 41 to 45 in 4ec4348

    /*#if COMPONENTS*/
    --editorInk-editing-cursor: pointer;
    /*#else*/
    --editorInk-editing-cursor: url(images/cursor-editorInk.svg) 0 16, pointer;
    /*#endif*/
    into --editorInk-editing-cursor: url(images/cursor-editorInk.svg) 0 16, pointer; unconditionally.

  • pdf.js/web/annotation_editor_layer_builder.css

    Lines 50 to 53 in 4ec4348

    /*#if !COMPONENTS*/
    --editorFreeText-editing-cursor: url(images/cursor-editorFreeText.svg) 0 16,
    text;
    /*#endif*/
    into --editorFreeText-editing-cursor: url(images/cursor-editorFreeText.svg) 0 16, text; unconditionally.

gulpfile.mjs Outdated Show resolved Hide resolved
@calixteman calixteman force-pushed the editor_highlight_cursor branch from 13afb81 to f3bdbed Compare January 26, 2024 17:17
@calixteman
Copy link
Contributor Author

/botio integrationtest

@moz-tools-bot
Copy link
Collaborator

From: Bot.io (Windows)

Received

Command cmd_integrationtest from @calixteman received. Current queue size: 0

Live output at: http://54.193.163.58:8877/9e157273a76cc68/output.txt

@moz-tools-bot
Copy link
Collaborator

From: Bot.io (Linux m4)

Received

Command cmd_integrationtest from @calixteman received. Current queue size: 0

Live output at: http://54.241.84.105:8877/479fef8a216a9a3/output.txt

@moz-tools-bot
Copy link
Collaborator

From: Bot.io (Linux m4)

Success

Full output at http://54.241.84.105:8877/479fef8a216a9a3/output.txt

Total script time: 6.04 mins

  • Integration Tests: Passed

@moz-tools-bot
Copy link
Collaborator

From: Bot.io (Windows)

Failed

Full output at http://54.193.163.58:8877/9e157273a76cc68/output.txt

Total script time: 18.42 mins

  • Integration Tests: FAILED

@calixteman calixteman merged commit e63fafd into mozilla:master Jan 26, 2024
9 checks passed
@calixteman calixteman deleted the editor_highlight_cursor branch January 26, 2024 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Snuffleupagus Snuffleupagus Snuffleupagus approved these changes

Assignees
No one assigned
Labels
editor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@calixteman @moz-tools-bot @Snuffleupagus