Skip to content
Snippets Groups Projects
Commit f0844d0b authored by jojohoch's avatar jojohoch
Browse files

Add property scale for video elements

If the property is set, the video will be scaled as far as its
container (static element or grid) allows, otherwise only up to its
maximum native size.
parent 87989036
No related branches found
No related tags found
No related merge requests found
import { PlayerElement, PlayerProperties, PositionedElement, PositionProperties, UIElement } from '../../models/uI-element';
import {
PlayerElement, PlayerProperties, PositionedElement, PositionProperties, UIElement
} from '../../models/uI-element';
import { initPlayerElement, initPositionedElement } from '../../util/unit-interface-initializer';
export class VideoElement extends UIElement implements PositionedElement, PlayerElement {
src: string = '';
scale: boolean = false;
positionProps: PositionProperties;
playerProps: PlayerProperties;
......
......@@ -5,9 +5,7 @@ import { MediaPlayerElementComponent } from '../../directives/media-player-eleme
@Component({
selector: 'app-video',
template: `
<div [style.object-fit]="'contain'"
[style.height.%]="100"
[style.width.%]="100">
<div [class]="elementModel.scale ? 'fit-video' : 'max-size-video'">
<video #player
(playing)="onMediaPlayStatusChanged.emit(this.elementModel.id)"
(pause)="onMediaPlayStatusChanged.emit(null)"
......@@ -26,7 +24,11 @@ import { MediaPlayerElementComponent } from '../../directives/media-player-eleme
</app-control-bar>
</div>
`,
styles: ['.correct-position{ display: block; margin-top: -4px; }']
styles: [
'.correct-position{ display: block; margin-top: -4px; }',
'.max-size-video{ width: fit-content; max-height: fit-content }',
'.fit-video{ width: 100%; height: 100%; object-fit: contain}'
]
})
export class VideoComponent extends MediaPlayerElementComponent {
@Input() elementModel!: VideoElement;
......
......@@ -400,7 +400,7 @@
<mat-checkbox *ngIf="combinedProperties.scale !== undefined"
[checked]="$any(combinedProperties.scale)"
(change)="updateModel.emit({ property: 'scale', value: $event.checked })">
{{'propertiesPanel.imageScale' | translate }}
{{'propertiesPanel.scale' | translate }}
</mat-checkbox>
<mat-checkbox *ngIf="combinedProperties.magnifier !== undefined"
......
......@@ -108,7 +108,7 @@
"floating": "schwebend",
"lineColoring": "Zeilenfärbung",
"lineColoringColor": "Zeilenfarbe",
"imageScale": "Bild skalieren",
"scale": "Skalieren",
"magnifier": "Lupe",
"magnifierSize": "Größe der Lupe",
"magnifierZoom": "Vergrößerungsfaktor",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment