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

[Editor] Change the cursor to a pen for the Ink editor #15146

Merged
merged 1 commit into from
Jul 7, 2022

Conversation

calixteman
Copy link
Contributor

No description provided.

Comment on lines 236 to 237
this.canvas.style.cursor =
"url(images/toolbarButton-editorInk.svg) 0 16, pointer";
Copy link
Collaborator

@Snuffleupagus Snuffleupagus Jul 7, 2022

Choose a reason for hiding this comment

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

Can't you set this in the CSS file instead, rather than hard-coding it here?

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.

r=me, with the comment addressed; thank you!

@@ -132,6 +133,7 @@

.annotationEditorLayer .inkEditor.editing {
resize: none;
cursor: url(images/toolbarButton-editorInk.svg) 0 16, pointer;
Copy link
Collaborator

@Snuffleupagus Snuffleupagus Jul 7, 2022

Choose a reason for hiding this comment

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

Also, to improve maintainability (similar to other CSS files):

Suggested change
cursor: url(images/toolbarButton-editorInk.svg) 0 16, pointer;
cursor: var(--editorInk-editing-cursor) 0 16, pointer;

... and add the following to the :root-declaration at the top of this file:

--editorInk-editing-cursor: url(images/toolbarButton-editorInk.svg);

Copy link
Contributor Author

@calixteman calixteman Jul 7, 2022

Choose a reason for hiding this comment

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

I added the 0 16 in the var since those values are related to the image itself.

@calixteman
Copy link
Contributor Author

/botio integrationtest

@pdfjsbot
Copy link

pdfjsbot commented Jul 7, 2022

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/2ae668d511be559/output.txt

@pdfjsbot
Copy link

pdfjsbot commented Jul 7, 2022

From: Bot.io (Windows)


Received

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

Live output at: http://54.193.163.58:8877/6ae6e6761a3f9ed/output.txt

@pdfjsbot
Copy link

pdfjsbot commented Jul 7, 2022

From: Bot.io (Linux m4)


Success

Full output at http://54.241.84.105:8877/2ae668d511be559/output.txt

Total script time: 4.73 mins

  • Integration Tests: Passed

@pdfjsbot
Copy link

pdfjsbot commented Jul 7, 2022

From: Bot.io (Windows)


Failed

Full output at http://54.193.163.58:8877/6ae6e6761a3f9ed/output.txt

Total script time: 7.92 mins

  • Integration Tests: FAILED

@calixteman calixteman merged commit 32d8c55 into mozilla:master Jul 7, 2022
@calixteman calixteman deleted the editing_cursor branch July 7, 2022 16:43
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants