mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-03 22:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix changing preview size to be smoother in fullscreen

Browse source
This commit is contained in:
Julien Wadel 2020-10-26 12:26:25 +01:00
parent 52505f040c
commit bc5e7c1bdc
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-app/ui/modules/Common/Helpers/DragBox.qml
View file

@ -21,6 +21,7 @@ Item {
// ---------------------------------------------------------------------------
signal clicked (var mouse)
signal doubleClicked (var mouse)
signal pressed (var mouse)
signal released (var mouse)
signal wheel (var wheel)
@ -102,6 +103,7 @@ Item {
axis: Drag.XandYAxis
target: parent
}
onDoubleClicked: dragBox.doubleClicked(mouse)
onClicked:dragBox.clicked(mouse)
onPressed: {
dragBox.pressed(mouse)

34
linphone-app/ui/views/App/Calls/IncallFullscreenWindow.qml
View file

@ -441,9 +441,8 @@ Window {
call: window.call
isPreview: true
height: (CallStyle.actionArea.userVideo.height * window.height/CallStyle.actionArea.userVideo.heightReference) * scale
width: (CallStyle.actionArea.userVideo.width * window.width/CallStyle.actionArea.userVideo.widthReference) * scale
height: Math.min(window.height, (CallStyle.actionArea.userVideo.height * window.height/CallStyle.actionArea.userVideo.heightReference) * scale)
width: Math.min(window.width, (CallStyle.actionArea.userVideo.width * window.width/CallStyle.actionArea.userVideo.widthReference) * scale )
DragBox {
container: window
draggable: parent
@ -457,14 +456,33 @@ Window {
var acceleration = 0.1;
if(startTime == 0){
startTime = new Date().getTime();
}else
acceleration = Math.max(0.005,10/(new Date().getTime() - startTime));
parent.scale = Math.max(0.5 , parent.scale+acceleration*(wheel.angleDelta.y >0 ? 1 : -1) );
updateBoundaries();
}else{
var delay = new Date().getTime() - startTime;
if(delay>0)
acceleration = Math.max(0.1, Math.min(2, 10/delay));
else
acceleration = 2
}
var newScale = Math.max(0.1 , parent.scale+acceleration*(wheel.angleDelta.y >0 ? 1 : -1) );
if( window.height > (CallStyle.actionArea.userVideo.height * window.height/CallStyle.actionArea.userVideo.heightReference) * newScale
&& window.width > (CallStyle.actionArea.userVideo.width * window.width/CallStyle.actionArea.userVideo.widthReference) * newScale){
parent.scale = newScale
var point = mapToItem(cameraPreviewItem.parent, wheel.x, wheel.y);
parent.x = point.x-parent.width/2;
parent.y = point.y-parent.height/2;
updateBoundaries();
}
startTime = new Date().getTime();
}
onDoubleClicked:{
parent.scale = 1;
resetPosition();
}
onClicked: if(mouse.button == Qt.RightButton) {
parent.scale = 1;
if( parent.scale>1)
parent.scale = 1;
else
parent.scale = 2;
resetPosition();
}
}