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

Switched to scale 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2020-12-19 15:54:26 +01:00
parent 633221f012
commit ae25ff8216
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/css/views/elements/_ImageView.scss
View File

@ -36,13 +36,14 @@ limitations under the License.
overflow: auto;
margin: 0 50px 50px 50px;
display: flex;
height: 100%;
}
.mx_ImageView_content img {
flex: 1;
object-fit: contain;
pointer-events: all;
margin: auto;
//margin: auto;
//margin: 0 auto 0 auto;
}
.mx_ImageView_panel {

9
src/components/views/elements/ImageView.js
View File

@ -160,14 +160,8 @@ export default class ImageView extends React.Component {
height: displayHeight
};
*/
let style = {};
let res;
style = {
width: this.state.zoom + "%",
height: this.state.zoom + "%",
};
if (this.props.width && this.props.height) {
res = this.props.width + "x" + this.props.height + "px";
}
@ -217,7 +211,8 @@ export default class ImageView extends React.Component {
}
const rotationDegrees = this.state.rotationDegrees;
const effectiveStyle = {transform: `rotate(${rotationDegrees}deg)`, ...style};
const zoom = this.state.zoom/100;
const effectiveStyle = {transform: `rotate(${rotationDegrees}deg) scale(${zoom})`};
return (
<FocusLock