From kde-commits Tue Jun 24 10:17:47 2014 From: Marco Martin Date: Tue, 24 Jun 2014 10:17:47 +0000 To: kde-commits Subject: [plasma-desktop] containments: take handle width into account Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=140360507731401 Git commit b7a975bc56a0523f3b25d6887327c3f926a8039b by Marco Martin. Committed on 24/06/2014 at 10:17. Pushed by mart into branch 'master'. take handle width into account BUG:336185 M +1 -1 containments/desktop/package/contents/ui/AppletHandle.qml M +1 -1 containments/folder/package/contents/ui/AppletHandle.qml http://commits.kde.org/plasma-desktop/b7a975bc56a0523f3b25d6887327c3f926a80= 39b diff --git a/containments/desktop/package/contents/ui/AppletHandle.qml b/co= ntainments/desktop/package/contents/ui/AppletHandle.qml index 971a07a..bd3935b 100644 --- a/containments/desktop/package/contents/ui/AppletHandle.qml +++ b/containments/desktop/package/contents/ui/AppletHandle.qml @@ -117,7 +117,7 @@ KQuickControlsAddons.MouseEventListener { LayoutManager.setSpaceAvailable(appletItem.x, appletIt= em.y, appletItem.width, appletItem.height, true) } onPositionChanged: { - appletItem.width =3D Math.max(appletItem.minimumWidth,= appletItem.width + mouse.x-startX); + appletItem.width =3D Math.max(appletItem.minimumWidth = + appletHandle.width, appletItem.width + mouse.x-startX); = var oldBottom =3D appletItem.y + appletItem.height; appletItem.height =3D Math.max(appletItem.minimumHeigh= t, appletItem.height + startY-mouse.y) diff --git a/containments/folder/package/contents/ui/AppletHandle.qml b/con= tainments/folder/package/contents/ui/AppletHandle.qml index 971a07a..bd3935b 100644 --- a/containments/folder/package/contents/ui/AppletHandle.qml +++ b/containments/folder/package/contents/ui/AppletHandle.qml @@ -117,7 +117,7 @@ KQuickControlsAddons.MouseEventListener { LayoutManager.setSpaceAvailable(appletItem.x, appletIt= em.y, appletItem.width, appletItem.height, true) } onPositionChanged: { - appletItem.width =3D Math.max(appletItem.minimumWidth,= appletItem.width + mouse.x-startX); + appletItem.width =3D Math.max(appletItem.minimumWidth = + appletHandle.width, appletItem.width + mouse.x-startX); = var oldBottom =3D appletItem.y + appletItem.height; appletItem.height =3D Math.max(appletItem.minimumHeigh= t, appletItem.height + startY-mouse.y)