forked from qt-creator/qt-creator
Qml: MouseRegion got renamed to MouseArea
Reviewed-by: Christian Kamm
This commit is contained in:
@@ -111,8 +111,8 @@ Item {
|
||||
color: style.itemNameTextColor
|
||||
}
|
||||
|
||||
MouseRegion {
|
||||
id: mouseRegion
|
||||
MouseArea {
|
||||
id: mouseArea
|
||||
anchors.fill: parent
|
||||
|
||||
property bool reallyPressed: false
|
||||
|
||||
@@ -59,7 +59,7 @@ Rectangle {
|
||||
/* workaround: without this, a completed drag and drop operation would
|
||||
result in the drag being continued when QmlView re-gains
|
||||
focus */
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
onEntered: if (!pressed) itemsView.stopDragAndDrop
|
||||
|
||||
@@ -87,7 +87,7 @@ Item {
|
||||
|
||||
onHeightChanged: updateHandle()
|
||||
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.top: parent.top
|
||||
@@ -125,7 +125,7 @@ Item {
|
||||
}
|
||||
}
|
||||
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
drag.target: parent
|
||||
drag.axis: "YAxis"
|
||||
@@ -134,7 +134,7 @@ Item {
|
||||
}
|
||||
}
|
||||
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.top: handle.bottom
|
||||
|
||||
@@ -107,7 +107,7 @@ Column {
|
||||
text: sectionName
|
||||
color: style.sectionTitleTextColor
|
||||
}
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
onClicked: {
|
||||
if (itemHighlight.visible &&
|
||||
|
||||
@@ -28,7 +28,7 @@ Rectangle {
|
||||
|
||||
// TextInputs don't loose focus automatically when user clicks away, have to be done explicitly
|
||||
signal unFocus
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.fill:parent
|
||||
hoverEnabled:true
|
||||
onExited: root.unFocus();
|
||||
@@ -201,7 +201,7 @@ Rectangle {
|
||||
}
|
||||
}
|
||||
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
id: itemRegion
|
||||
anchors.fill: container
|
||||
onClicked: {
|
||||
@@ -286,7 +286,7 @@ Rectangle {
|
||||
}
|
||||
}
|
||||
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.fill:parent
|
||||
onClicked: {
|
||||
root.unFocus();
|
||||
@@ -325,7 +325,7 @@ Rectangle {
|
||||
elide:Qt.ElideMiddle
|
||||
horizontalAlignment:Qt.AlignHCenter
|
||||
}
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
id: txtRegion
|
||||
anchors.fill:parent
|
||||
onClicked: {
|
||||
@@ -489,7 +489,7 @@ Rectangle {
|
||||
anchors.centerIn:parent
|
||||
}
|
||||
}
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.fill:parent
|
||||
onClicked: {
|
||||
// force close textinput
|
||||
@@ -557,7 +557,7 @@ Rectangle {
|
||||
}
|
||||
}
|
||||
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.fill:parent
|
||||
property int dragging:0;
|
||||
property int originalX:0;
|
||||
|
||||
@@ -41,9 +41,9 @@
|
||||
<property name="text" type="QString" value="textInput"/>
|
||||
</itemlibraryrepresentation>
|
||||
</node>
|
||||
<node name="Qt/MouseRegion" showInItemLibrary="true" category="Qt - Interaction" icon=":/fxplugin/images/mouse-region-icon.png">
|
||||
<node name="Qt/MouseArea" showInItemLibrary="true" category="Qt - Interaction" icon=":/fxplugin/images/mouse-area-icon.png">
|
||||
<inherits name="Item" />
|
||||
<itemlibraryrepresentation name="Mouse Region" icon=":/fxplugin/images/mouse-region-icon.png">
|
||||
<itemlibraryrepresentation name="Mouse Area" icon=":/fxplugin/images/mouse-area-icon.png">
|
||||
<property name="width" type="int" value="100"/>
|
||||
<property name="height" type="int" value="100"/>
|
||||
</itemlibraryrepresentation>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<file>images/blended-image-icon.png</file>
|
||||
<file>images/image-icon.png</file>
|
||||
<file>images/item-icon.png</file>
|
||||
<file>images/mouse-region-icon.png</file>
|
||||
<file>images/mouse-area-icon.png</file>
|
||||
<file>images/rect-icon.png</file>
|
||||
<file>images/text-edit-icon.png</file>
|
||||
<file>images/text-icon.png</file>
|
||||
|
||||
|
Before Width: | Height: | Size: 511 B After Width: | Height: | Size: 511 B |
@@ -22,7 +22,7 @@ Item {
|
||||
text: modelData.name + "(" + modelData.engineId + ")"
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
onClicked: root.engineClicked(modelData.engineId);
|
||||
}
|
||||
@@ -38,7 +38,7 @@ Item {
|
||||
height: 63;
|
||||
smooth: true
|
||||
anchors.right: parent.right
|
||||
MouseRegion {
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
onClicked: Root.refreshEngines()
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ Item {
|
||||
}
|
||||
If you delete the name maybe the 'id:' should be deleted as well.
|
||||
|
||||
This is fine for most other QML elements such as Rectangle and MouseRegion
|
||||
This is fine for most other QML elements such as Rectangle and MouseArea
|
||||
|
||||
----------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user