From dca4702b7b3df510e9b9fd28524e5e5ac0b57448 Mon Sep 17 00:00:00 2001 From: wmwragg Date: Wed, 27 Jul 2016 09:51:50 +0100 Subject: [PATCH] Fixed a bug where the contextual menu was being incorrectly positioned when zoom in on the webpage --- src/components/views/rooms/EventTile.js | 6 ++++-- src/components/views/rooms/RoomTile.js | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 77be8226a2..129eb120fa 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -251,8 +251,10 @@ module.exports = React.createClass({ onEditClicked: function(e) { var MessageContextMenu = sdk.getComponent('rooms.MessageContextMenu'); var buttonRect = e.target.getBoundingClientRect() - var x = buttonRect.right; - var y = buttonRect.top + (e.target.height / 2); + + // The window X and Y offsets are to adjust position when zoomed in to page + var x = buttonRect.right + window.pageXOffset; + var y = buttonRect.top + (e.target.height / 2) + window.pageYOffset; var self = this; ContextualMenu.createMenu(MessageContextMenu, { mxEvent: this.props.mxEvent, diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index 28574fcec5..ce4888e896 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -77,8 +77,9 @@ module.exports = React.createClass({ onBadgeClicked: function(e) { var Menu = sdk.getComponent('rooms.NotificationStateContextMenu'); var elementRect = e.target.getBoundingClientRect(); - var x = elementRect.right; - var y = elementRect.top + (elementRect.height / 2); + // The window X and Y offsets are to adjust position when zoomed in to page + var x = elementRect.right + window.pageXOffset; + var y = elementRect.top + (elementRect.height / 2) + window.pageYOffset; var self = this; ContextualMenu.createMenu(Menu, { left: x,