OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4408 from matrix-org/t3chguy/fix_network_dropdown_scrolling 

Allow network dropdown to be scrollable and fix context menu padding calc
pull/21833/head
Michael Telatynski 2020-04-15 14:08:34 +01:00 committed by GitHub
parent fafe57624c 769cf1c987
commit 7efbae0470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/css/views/directory/_NetworkDropdown.scss
View File

@ -35,6 +35,8 @@ limitations under the License.
border-radius: 4px; border-radius: 4px;
border: 1px solid $dialog-close-fg-color; border: 1px solid $dialog-close-fg-color;
background-color: $primary-bg-color; background-color: $primary-bg-color;
max-height: calc(100vh - 20px); // allow 10px padding on both top and bottom
overflow-y: auto;
} }
.mx_NetworkDropdown_menu_network { .mx_NetworkDropdown_menu_network {

4
src/components/structures/ContextMenu.js
View File

@ -245,7 +245,6 @@ export class ContextMenu extends React.Component {
} }
const contextMenuRect = this.state.contextMenuElem ? this.state.contextMenuElem.getBoundingClientRect() : null; const contextMenuRect = this.state.contextMenuElem ? this.state.contextMenuElem.getBoundingClientRect() : null;
const padding = 10;
const chevronOffset = {}; const chevronOffset = {};
if (props.chevronFace) { if (props.chevronFace) {
@ -264,7 +263,8 @@ export class ContextMenu extends React.Component {
// If we know the dimensions of the context menu, adjust its position // If we know the dimensions of the context menu, adjust its position
// such that it does not leave the (padded) window. // such that it does not leave the (padded) window.
if (contextMenuRect) { if (contextMenuRect) {
adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height - padding); const padding = 10;
adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height + padding);
} }
position.top = adjusted; position.top = adjusted;