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

Merge pull request #5447 from matrix-org/travis/fix-stickerpicker 

Fix the stickerpicker
pull/21833/head
Travis Ralston 2020-11-27 07:06:35 -07:00 committed by GitHub
parent e5047e7f83 f2bc3db8fd
commit ced68a6fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/css/views/rooms/_Stickers.scss
View File

@ -22,7 +22,7 @@
iframe { iframe {
// Sticker picker depends on the fixed height previously used for all tiles // Sticker picker depends on the fixed height previously used for all tiles
height: 273px; height: 283px; // height of the popout minus the AppTile menu bar
} }
} }

23
src/components/views/elements/AppTile.js
View File

@ -375,17 +375,20 @@ export default class AppTile extends React.Component {
</div> </div>
); );
// all widgets can theoretically be allowed to remain on screen, so we wrap if (!this.props.userWidget) {
// them all in a PersistedElement from the get-go. If we wait, the iframe will // All room widgets can theoretically be allowed to remain on screen, so we
// be re-mounted later, which means the widget has to start over, which is bad. // wrap them all in a PersistedElement from the get-go. If we wait, the iframe
// will be re-mounted later, which means the widget has to start over, which is
// bad.
// Also wrap the PersistedElement in a div to fix the height, otherwise // Also wrap the PersistedElement in a div to fix the height, otherwise
// AppTile's border is in the wrong place // AppTile's border is in the wrong place
appTileBody = <div className="mx_AppTile_persistedWrapper"> appTileBody = <div className="mx_AppTile_persistedWrapper">
<PersistedElement persistKey={this._persistKey}> <PersistedElement persistKey={this._persistKey}>
{appTileBody} {appTileBody}
</PersistedElement> </PersistedElement>
</div>; </div>;
}
} }
} }