mirror of
https://github.com/KDE/latte-dock.git
synced 2025-02-10 09:57:35 +03:00
support all screen edges for settings dragging
This commit is contained in:
Michail Vourlakos
parent
c8670a7561
commit
65569b1a9a
@ -131,81 +131,8 @@ FocusScope {
|
||||
onEnabledBordersChanged: viewConfig.updateEffects()
|
||||
Component.onCompleted: viewConfig.updateEffects()
|
||||
|
||||
Rectangle {
|
||||
width: 25
|
||||
height: width
|
||||
anchors.horizontalCenter: parent.right
|
||||
anchors.verticalCenter: parent.top
|
||||
rotation: 45
|
||||
color: resizeWindowMouseArea.isActive ? theme.buttonFocusColor : theme.textColor
|
||||
opacity: resizeWindowMouseArea.isActive ? 1 : 0.2
|
||||
|
||||
MouseArea {
|
||||
id: resizeWindowMouseArea
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
|
||||
readonly property bool isActive: containsMouse || pressed
|
||||
|
||||
property bool initialized: false
|
||||
property int initGlobalX: 0
|
||||
property int initGlobalY: 0
|
||||
property int initWidth: 100
|
||||
property int initHeight: 100
|
||||
property real initScaleWidth: 1
|
||||
property real initScaleHeight: 1
|
||||
|
||||
onPressed: {
|
||||
if (pressed) {
|
||||
var scenePos = mapToGlobal(mouse.x, mouse.y);
|
||||
initGlobalX = viewConfig.x + scenePos.x;
|
||||
initGlobalY = viewConfig.y + mouse.y;
|
||||
initWidth = dialog.width;
|
||||
initHeight = dialog.height;
|
||||
initScaleWidth = userScaleWidth;
|
||||
initScaleHeight = userScaleHeight;
|
||||
initialized = true;
|
||||
}
|
||||
}
|
||||
|
||||
onPositionChanged: {
|
||||
if (pressed && initialized) {
|
||||
var scenePos = mapToGlobal(mouse.x, mouse.y);
|
||||
var curGlobalX = viewConfig.x + scenePos.x;
|
||||
var curGlobalY = viewConfig.y + mouse.y;
|
||||
|
||||
var differX = curGlobalX - initGlobalX;
|
||||
var percentX = differX / initWidth;
|
||||
var newScaleWidth = Math.max(0.35, initScaleWidth + (percentX*initScaleWidth)).toFixed(3);
|
||||
|
||||
var newScaleHeight = userScaleHeight;
|
||||
|
||||
if (!dialog.advancedLevel) {
|
||||
var differY = initGlobalY - curGlobalY;
|
||||
var percentY = differY / initHeight;
|
||||
newScaleHeight = Math.max(0.5, initScaleHeight + (percentY*initScaleHeight)).toFixed(3);
|
||||
}
|
||||
|
||||
universalSettings.setScreenScales(latteView.positioner.currentScreenName, newScaleWidth, newScaleHeight);
|
||||
userScaleWidth = newScaleWidth;
|
||||
userScaleHeight = newScaleHeight;
|
||||
viewConfig.syncGeometry();
|
||||
} else if (!pressed) {
|
||||
initialized = false;
|
||||
}
|
||||
}
|
||||
|
||||
onReleased: {
|
||||
initialized = false;
|
||||
}
|
||||
|
||||
onDoubleClicked: {
|
||||
userScaleWidth = 1;
|
||||
userScaleHeight = 1;
|
||||
universalSettings.setScreenScales(latteView.positioner.currentScreenName, 1, 1);
|
||||
viewConfig.syncGeometry();
|
||||
}
|
||||
}
|
||||
LatteExtraControls.DragCorner {
|
||||
id: dragCorner
|
||||
}
|
||||
}
|
||||
|
||||
@ -215,7 +142,7 @@ FocusScope {
|
||||
text: dialog.advancedLevel ?
|
||||
i18nc("view settings width scale","Width %0%").arg(userScaleWidth * 100) :
|
||||
i18nc("view settings width scale","Width %0% / Height %1%").arg(userScaleWidth * 100).arg(userScaleHeight * 100)
|
||||
visible: resizeWindowMouseArea.isActive
|
||||
visible: dragCorner.isActive
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
@ -573,7 +500,7 @@ FocusScope {
|
||||
RowLayout {
|
||||
id: actionButtons
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
||||
|
||||
spacing: units.largeSpacing
|
||||
|
||||
|
||||
175
shell/package/contents/controls/DragCorner.qml
Normal file
175
shell/package/contents/controls/DragCorner.qml
Normal file
@ -0,0 +1,175 @@
|
||||
/*
|
||||
* Copyright 2021 Michail Vourlakos <mvourlakos@gmail.com>
|
||||
*
|
||||
* This file is part of Latte-Dock
|
||||
*
|
||||
* Latte-Dock is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Latte-Dock is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import QtQuick 2.7
|
||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||
|
||||
Rectangle {
|
||||
id: _corner
|
||||
width: 22
|
||||
height: width
|
||||
anchors.horizontalCenter: parent.right
|
||||
anchors.verticalCenter: parent.top
|
||||
rotation: 45
|
||||
color: resizeWindowMouseArea.isActive ? theme.buttonFocusColor : theme.textColor
|
||||
opacity: resizeWindowMouseArea.isActive ? 1 : 0.2
|
||||
|
||||
readonly property alias isActive: resizeWindowMouseArea.isActive
|
||||
|
||||
MouseArea {
|
||||
id: resizeWindowMouseArea
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
|
||||
cursorShape: plasmoid.location === PlasmaCore.Types.LeftEdge ? Qt.SizeBDiagCursor : Qt.SizeFDiagCursor
|
||||
|
||||
readonly property bool isActive: containsMouse || pressed
|
||||
|
||||
property bool initialized: false
|
||||
property int initGlobalX: 0
|
||||
property int initGlobalY: 0
|
||||
property int initWidth: 100
|
||||
property int initHeight: 100
|
||||
property real initScaleWidth: 1
|
||||
property real initScaleHeight: 1
|
||||
|
||||
property int curGlobalX: 0
|
||||
property int curGlobalY: 0
|
||||
|
||||
onPressed: {
|
||||
if (pressed) {
|
||||
var scenePos = mapToGlobal(mouse.x, mouse.y);
|
||||
|
||||
if (plasmoid.location !== PlasmaCore.Types.LeftEdge) {
|
||||
initGlobalX = viewConfig.x + mouse.x;
|
||||
initGlobalY = viewConfig.y + mouse.y;
|
||||
} else {
|
||||
initGlobalX = viewConfig.x + mouse.x;
|
||||
initGlobalY = viewConfig.y + mouse.y;
|
||||
}
|
||||
|
||||
initWidth = dialog.width;
|
||||
initHeight = dialog.height;
|
||||
initScaleWidth = dialog.userScaleWidth;
|
||||
initScaleHeight = dialog.userScaleHeight;
|
||||
initialized = true;
|
||||
}
|
||||
}
|
||||
|
||||
onPositionChanged: {
|
||||
if (pressed && initialized) {
|
||||
var scenePos = mapToGlobal(mouse.x, mouse.y);
|
||||
if (plasmoid.location !== PlasmaCore.Types.LeftEsge) {
|
||||
curGlobalX = viewConfig.x + mouse.x;
|
||||
curGlobalY = viewConfig.y + mouse.y;
|
||||
} else {
|
||||
curGlobalX = viewConfig.x + mouse.x;
|
||||
curGlobalY = viewConfig.y + mouse.y;
|
||||
}
|
||||
|
||||
var differX = 0;
|
||||
|
||||
if (plasmoid.location !== PlasmaCore.Types.LeftEdge) {
|
||||
differX = initGlobalX - curGlobalX;
|
||||
} else {
|
||||
differX = curGlobalX - initGlobalX;
|
||||
}
|
||||
|
||||
var percentX = differX / initWidth;
|
||||
var newScaleWidth = Math.max(0.35, initScaleWidth + (percentX*initScaleWidth)).toFixed(3);
|
||||
|
||||
var newScaleHeight = dialog.userScaleHeight;
|
||||
|
||||
if (!dialog.advancedLevel) {
|
||||
var differY = 0;
|
||||
|
||||
if (plasmoid.location !== PlasmaCore.Types.LeftEdge) {
|
||||
if (plasmoid.location === PlasmaCore.Types.TopEdge) {
|
||||
differY = curGlobalY - initGlobalY;
|
||||
} else {
|
||||
differY = initGlobalY - curGlobalY;
|
||||
}
|
||||
} else {
|
||||
differY = initGlobalY - curGlobalY;
|
||||
}
|
||||
|
||||
var percentY = differY / initHeight;
|
||||
newScaleHeight = Math.max(0.5, initScaleHeight + (percentY*initScaleHeight)).toFixed(3);
|
||||
}
|
||||
|
||||
universalSettings.setScreenScales(latteView.positioner.currentScreenName, newScaleWidth, newScaleHeight);
|
||||
dialog.userScaleWidth = newScaleWidth;
|
||||
dialog.userScaleHeight = newScaleHeight;
|
||||
viewConfig.syncGeometry();
|
||||
} else if (!pressed) {
|
||||
initialized = false;
|
||||
}
|
||||
}
|
||||
|
||||
onReleased: {
|
||||
initialized = false;
|
||||
}
|
||||
|
||||
onDoubleClicked: {
|
||||
dialog.userScaleWidth = 1;
|
||||
dialog.userScaleHeight = 1;
|
||||
universalSettings.setScreenScales(latteView.positioner.currentScreenName, 1, 1);
|
||||
viewConfig.syncGeometry();
|
||||
}
|
||||
}
|
||||
|
||||
states:[
|
||||
State{
|
||||
name: "bottom"
|
||||
when: plasmoid.location === PlasmaCore.Types.BottomEdge
|
||||
|
||||
AnchorChanges{
|
||||
target: _corner;
|
||||
anchors.horizontalCenter: parent.left; anchors.verticalCenter: parent.top;
|
||||
}
|
||||
},
|
||||
State{
|
||||
name: "top"
|
||||
when: plasmoid.location === PlasmaCore.Types.TopEdge
|
||||
|
||||
AnchorChanges{
|
||||
target: _corner;
|
||||
anchors.horizontalCenter: parent.left; anchors.verticalCenter: parent.top;
|
||||
}
|
||||
},
|
||||
State{
|
||||
name: "left"
|
||||
when: plasmoid.location === PlasmaCore.Types.LeftEdge
|
||||
|
||||
AnchorChanges{
|
||||
target: _corner;
|
||||
anchors.horizontalCenter: parent.right; anchors.verticalCenter: parent.top;
|
||||
}
|
||||
},
|
||||
State{
|
||||
name: "right"
|
||||
when: plasmoid.location === PlasmaCore.Types.RightEdge
|
||||
|
||||
AnchorChanges{
|
||||
target: _corner;
|
||||
anchors.horizontalCenter: parent.left; anchors.verticalCenter: parent.top;
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user