mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix tag selector menus not appearing on fx102 (#2654)

Browse source 
Also tweaked offset where a context menu appears to 1px from cursor
(was 2px) to match other context menus.
This commit is contained in:
Tom Najdek 2022-06-15 00:28:02 +02:00 • committed by GitHub
parent cd17c90f2e
commit cb3d4b1800
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

5
chrome/content/zotero/containers/tagSelectorContainer.jsx
View file

@ -508,9 +508,10 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
tagContextMenu.childNodes[i].disabled = this.state.viewOnly;
}
ev.preventDefault();
tagContextMenu.openPopupAtScreen(
window.screenX + ev.clientX + 2,
window.screenY + ev.clientY + 2,
ev.screenX + 1,
ev.screenY + 1,
true
);
this.contextTag = tag;

55
chrome/content/zotero/zoteroPane.xhtml
View file

@ -1225,34 +1225,6 @@
<menuseparator/>
<menuitem id="context-pane-list-move-to-trash" label="&zotero.general.moveToTrash;"/>
</menupopup>
</popupset>
</hbox>
<!-- Barrier to prevent tabbing into Zotero pane when busy -->
<box id="zotero-pane-tab-catcher-bottom" hidden="true" align="center" pack="center" style="opacity: 0">
<checkbox/>
</box>
<stack id="zotero-pane-overlay" flex="1" hidden="true">
<box style="background: black; opacity: .3" flex="1"/>
<deck id="zotero-pane-overlay-deck" flex="1">
<box id="zotero-pane-progress" flex="1" align="center" pack="center">
<box style="background: white; border-radius: 1px; box-shadow: gray 4px 6px 4px;" width="300" height="30">
<vbox id="zotero-pane-progressmeter-container" style="padding:10px" flex="1">
<label id="zotero-pane-progress-label"/>
<!-- See note in Zotero.showZoteroPaneProgressMeter()
<progressmeter id="zotero-pane-progressmeter" mode="undetermined"/> -->
</vbox>
</box>
</box>
</deck>
</stack>
</stack>
</vbox>
</hbox>
<!-- Tag Selector -->
<menupopup id="tag-menu">
<menuitem label="&zotero.tagSelector.assignColor;"
@ -1296,4 +1268,31 @@
this.setAttribute('checked', false);
event.stopPropagation();"/>
</menupopup>
</popupset>
</hbox>
<!-- Barrier to prevent tabbing into Zotero pane when busy -->
<box id="zotero-pane-tab-catcher-bottom" hidden="true" align="center" pack="center" style="opacity: 0">
<checkbox/>
</box>
<stack id="zotero-pane-overlay" flex="1" hidden="true">
<box style="background: black; opacity: .3" flex="1"/>
<deck id="zotero-pane-overlay-deck" flex="1">
<box id="zotero-pane-progress" flex="1" align="center" pack="center">
<box style="background: white; border-radius: 1px; box-shadow: gray 4px 6px 4px;" width="300" height="30">
<vbox id="zotero-pane-progressmeter-container" style="padding:10px" flex="1">
<label id="zotero-pane-progress-label"/>
<!-- See note in Zotero.showZoteroPaneProgressMeter()
<progressmeter id="zotero-pane-progressmeter" mode="undetermined"/> -->
</vbox>
</box>
</box>
</deck>
</stack>
</stack>
</vbox>
</hbox>
</window>