marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-03 18:24:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove pragma from layoutmanagers

Browse source 
use the layoutmanager as a propeerty of root emlement
This commit is contained in:
Marco Martin 2015-07-15 13:44:49 +02:00
parent f38791c7f7
commit 2353652336
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
containments/homescreen/package/contents/code/LayoutManager.js
View file

@ -17,8 +17,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
.pragma library
var layout; var layout;
var root; var root;

10
containments/homescreen/package/contents/ui/AppletsArea.qml
View file

@ -24,8 +24,6 @@ import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import "LayoutManager.js" as LayoutManager
MouseEventListener { MouseEventListener {
id: headerItem id: headerItem
z: 999 z: 999
@ -69,7 +67,7 @@ MouseEventListener {
if (draggingApplet) { if (draggingApplet) {
draggingApplet.animationsEnabled = false; draggingApplet.animationsEnabled = false;
dndSpacer.height = draggingApplet.height; dndSpacer.height = draggingApplet.height;
LayoutManager.insertBefore(draggingApplet, dndSpacer); root.layoutManager.insertBefore(draggingApplet, dndSpacer);
draggingApplet.parent = headerItem; draggingApplet.parent = headerItem;
pos = mapToItem(headerItem, mouse.x, mouse.y); pos = mapToItem(headerItem, mouse.x, mouse.y);
@ -98,9 +96,9 @@ MouseEventListener {
if (itemUnderMouse && itemUnderMouse != dndSpacer) { if (itemUnderMouse && itemUnderMouse != dndSpacer) {
dndSpacer.parent = colorScope; dndSpacer.parent = colorScope;
if (pos.y < itemUnderMouse.y + itemUnderMouse.height/2) { if (pos.y < itemUnderMouse.y + itemUnderMouse.height/2) {
LayoutManager.insertBefore(itemUnderMouse, dndSpacer); root.layoutManager.insertBefore(itemUnderMouse, dndSpacer);
} else { } else {
LayoutManager.insertAfter(itemUnderMouse, dndSpacer); root.layoutManager.insertAfter(itemUnderMouse, dndSpacer);
} }
} }
@ -123,7 +121,7 @@ MouseEventListener {
if (draggingApplet.x > -draggingApplet.width/4 && draggingApplet.x < draggingApplet.width/4) { if (draggingApplet.x > -draggingApplet.width/4 && draggingApplet.x < draggingApplet.width/4) {
draggingApplet.x = 0; draggingApplet.x = 0;
LayoutManager.insertBefore( dndSpacer, draggingApplet); root.layoutManager.insertBefore( dndSpacer, draggingApplet);
draggingApplet.animationsEnabled = true; draggingApplet.animationsEnabled = true;
} else { } else {
removeAnim.target = draggingApplet; removeAnim.target = draggingApplet;

1
containments/homescreen/package/contents/ui/main.qml
View file

@ -37,6 +37,7 @@ Item {
property int buttonHeight: width/4 property int buttonHeight: width/4
property bool reorderingApps: false property bool reorderingApps: false
property bool locked: applicationsView.contentY < -applicationsView.headerItem.height + plasmoid.availableScreenRect.height property bool locked: applicationsView.contentY < -applicationsView.headerItem.height + plasmoid.availableScreenRect.height
property var layoutManager: LayoutManager
//END properties //END properties
//BEGIN functions //BEGIN functions

2
containments/panel/contents/code/LayoutManager.js
View file

@ -17,8 +17,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
.pragma library
var layout; var layout;
var root; var root;

1
containments/panel/contents/ui/main.qml
View file

@ -37,6 +37,7 @@ PlasmaCore.ColorScope {
property int buttonHeight: width/4 property int buttonHeight: width/4
property bool reorderingApps: false property bool reorderingApps: false
property QtObject expandedApplet property QtObject expandedApplet
property var layoutManager: LayoutManager
Containment.onAppletAdded: { Containment.onAppletAdded: {
addApplet(applet, x, y); addApplet(applet, x, y);