summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-07-23 13:59:14 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-07-23 14:10:40 (GMT)
commit999a0ad04fa9575cd4e89f1dcaa1b61efb216bc3 (patch)
tree4733e10b53a99caee6c764d46ddd57927d50d425
parent70200bbeb53f7620e4138171e89e3ca34fd819c6 (diff)
Fix URL opening. Condensed mode toggle on any tap.
-rw-r--r--src/apps/marble-maps/IconText.qml7
-rw-r--r--src/apps/marble-maps/PlacemarkDialog.qml14
2 files changed, 7 insertions, 14 deletions
diff --git a/src/apps/marble-maps/IconText.qml b/src/apps/marble-maps/IconText.qml
index acb9292..1a5b0ca 100644
--- a/src/apps/marble-maps/IconText.qml
+++ b/src/apps/marble-maps/IconText.qml
@@ -22,8 +22,6 @@ Item {
property alias font: text.font
property alias maximumLineCount: text.maximumLineCount
- signal clicked()
-
Image {
id: icon
sourceSize.height: Screen.pixelDensity * 3
@@ -48,9 +46,4 @@ Item {
cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
}
}
-
- MouseArea {
- anchors.fill: parent
- onClicked: root.clicked()
- }
}
diff --git a/src/apps/marble-maps/PlacemarkDialog.qml b/src/apps/marble-maps/PlacemarkDialog.qml
index 4c50463..8f17cc4 100644
--- a/src/apps/marble-maps/PlacemarkDialog.qml
+++ b/src/apps/marble-maps/PlacemarkDialog.qml
@@ -53,6 +53,13 @@ Item {
color: palette.base
}
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ condensed = !condensed
+ }
+ }
+
Bookmarks {
id: bookmarks
}
@@ -78,13 +85,6 @@ Item {
width: parent.width
text: placemark === null ? "" : placemark.description
maximumLineCount: condensed ? 4 : undefined
-
- MouseArea {
- anchors.fill: parent
- onClicked: {
- condensed = !condensed
- }
- }
}
IconText {