mirror of https://github.com/vector-im/riot-web
Use height and width properties for scaling again
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>pull/21833/head
parent
ec5fcaf59b
commit
be9b68a4dd
|
@ -33,17 +33,18 @@ limitations under the License.
|
|||
}
|
||||
|
||||
.mx_ImageView_imageBox {
|
||||
overflow: auto;
|
||||
margin: 0 50px 50px 50px;
|
||||
overflow: scroll;
|
||||
display: flex;
|
||||
height: 100%;
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
.mainImage {
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.mx_ImageView_content img {
|
||||
object-fit: contain;
|
||||
pointer-events: all;
|
||||
//margin: auto;
|
||||
//margin: 0 auto 0 auto;
|
||||
}
|
||||
|
||||
.mx_ImageView_panel {
|
||||
|
|
|
@ -163,6 +163,10 @@ export default class ImageView extends React.Component {
|
|||
};
|
||||
*/
|
||||
let res;
|
||||
const style = {
|
||||
height: this.state.zoom + "%",
|
||||
width: this.state.zoom + "%",
|
||||
};
|
||||
|
||||
if (this.props.width && this.props.height) {
|
||||
res = this.props.width + "x" + this.props.height + "px";
|
||||
|
@ -213,8 +217,7 @@ export default class ImageView extends React.Component {
|
|||
}
|
||||
|
||||
const rotationDegrees = this.state.rotationDegrees;
|
||||
const zoom = this.state.zoom/100;
|
||||
const effectiveStyle = {transform: `rotate(${rotationDegrees}deg) scale(${zoom})`};
|
||||
const effectiveStyle = {transform: `rotate(${rotationDegrees}deg)`, ...style};
|
||||
|
||||
return (
|
||||
<FocusLock
|
||||
|
|
Loading…
Reference in New Issue