Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Restore disabled dragging and context menu for Bookmarks Bar on Windows #12676

Merged
merged 1 commit into from
Jan 18, 2018

Conversation

petemill
Copy link
Member

@petemill petemill commented Jan 17, 2018

Previously it was enough to not add 'drag' to the bookmarks bar on Windows, but now that it is added at a higher level in the DOM (so that dragging works in the margin between the bars) via #10512, we have to explicitly set it to 'no-drag' on each child.

Fix #11728

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed. (Ask a Brave employee to help if you cannot access this document.)

Test Plan

Windows only

  1. Turn on bookmarks bar
  2. Add a bookmark to enable bookmark toolbar
  3. Right click anywhere on the tool bar

Expected

  • On a link / folder, shows relevant context menu, not system window context menu
  • On an empty space, shows 'add folder' context menu, not system window context menu

Reviewer Checklist:

  • Request a security/privacy review as needed if one was not already requested.

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

Previously it was enough to not add 'drag' to the bookmarks bar on Windows, but now that it is added at a higher level in the DOM (so that dragging works in the margin between the bars) via #10512, we have to explicitly set it to 'no-drag' on each child.

Fix #11728
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

Works beautifully! 😄 👍

@bsclifton bsclifton merged commit c576b37 into master Jan 18, 2018
@bsclifton bsclifton deleted the fix/issue-11728 branch January 18, 2018 00:25
@bsclifton
Copy link
Member

master c576b37

@petemill can you help me cherry-pick this one into 0.21.x and 0.20.x? Getting some conflicts and want to make sure it's done properly 😄

@petemill
Copy link
Member Author

@bsclifton I'll take a look!

petemill added a commit that referenced this pull request Jan 18, 2018
Restore disabled dragging and context menu for Bookmarks Bar on Windows
petemill added a commit that referenced this pull request Jan 18, 2018
Restore disabled dragging and context menu for Bookmarks Bar on Windows
@petemill
Copy link
Member Author

0.21.x 565c4a9
0.20.x 54f89bc

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants