git.iko.soy/unity8
on xenial help sign in
add text to drop targets
ccd07faMichael Zanetti
qml/Stage/Spread/WorkspacePreview.qml+26−4
compare with xenial
unifiedsplit
@@ -85,18 +85,40 @@ Item {
85 anchors.rightMargin: parent.width / 2
85 anchors.rightMargin: parent.width / 2
86 color: "#55000000"
86 color: "#55000000"
87 visible: previewSpace.containsDragLeft
87 visible: previewSpace.containsDragLeft
88+
89+ Column {
90+ anchors.centerIn: parent
91+ spacing: units.gu(1)
92+ Icon {
93+ source: "../graphics/multi-monitor_leave.png"
94+ height: units.gu(4)
95+ width: height
96+ anchors.horizontalCenter: parent.horizontalCenter
97+ }
98+ Label {
99+ text: qsTr("Drop")
100+ }
101+ }
88 }
102 }
103+
89 Rectangle {
104 Rectangle {
90 anchors.fill: parent
105 anchors.fill: parent
91 anchors.leftMargin: parent.width / 2
106 anchors.leftMargin: parent.width / 2
92 color: "#55000000"
107 color: "#55000000"
93 visible: previewSpace.containsDragRight
108 visible: previewSpace.containsDragRight
94
109
95− Icon {
110+ Column {
96− source: "../graphics/multi-monitor_leave.png"
97− height: units.gu(4)
98− width: height
99 anchors.centerIn: parent
111 anchors.centerIn: parent
112+ spacing: units.gu(1)
113+ Icon {
114+ source: "../graphics/multi-monitor_leave.png"
115+ height: units.gu(4)
116+ width: height
117+ anchors.horizontalCenter: parent.horizontalCenter
118+ }
119+ Label {
120+ text: qsTr("Drop and go")
121+ }
100 }
122 }
101 }
123 }
102}
124}
qml/Stage/Stage.qml+1−1
@@ -571,7 +571,7 @@ FocusScope {
571 ScreensAndWorkspaces {
571 ScreensAndWorkspaces {
572 id: screensAndWorkspaces
572 id: screensAndWorkspaces
573 anchors { left: parent.left; top: parent.top; right: parent.right; leftMargin: root.leftMargin }
573 anchors { left: parent.left; top: parent.top; right: parent.right; leftMargin: root.leftMargin }
574− height: parent.height * .3
574+ height: Math.max(units.gu(35), parent.height * .4)
575 background: root.background
575 background: root.background
576 opacity: 0
576 opacity: 0
577 visible: opacity > 0
577 visible: opacity > 0