From 4da2cb685cbf4d96a70c4c18739738b8a97a773d Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Tue, 16 Aug 2016 10:43:05 -0700 Subject: [PATCH] Set full url path to where the picture was taken. Expand width of scroll, but leave a margin at both ends. Include an image at the end to indicate that the scroll is swipable. Adjust ighlight color and border size. --- .../resources/images/Swipe-Icon-single.svg | 42 +++++++++++++++++++ interface/resources/qml/AddressBarDialog.qml | 16 +++++-- 2 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 interface/resources/images/Swipe-Icon-single.svg diff --git a/interface/resources/images/Swipe-Icon-single.svg b/interface/resources/images/Swipe-Icon-single.svg new file mode 100644 index 0000000000..277a6050db --- /dev/null +++ b/interface/resources/images/Swipe-Icon-single.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 988f13a0a7..122033b241 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -53,6 +53,7 @@ Window { storyCard.placeName = card.placeName; storyCard.actionPhrase = card.actionPhrase; storyCard.timePhrase = card.timePhrase; + storyCard.hifiUrl = card.hifiUrl; storyCard.visible = true; return; } @@ -78,7 +79,7 @@ Window { ListView { id: scroll - width: (3 * cardWidth) + (2 * hifi.layout.spacing); + width: backgroundImage.width; height: cardHeight; spacing: hifi.layout.spacing; clip: true; @@ -106,9 +107,18 @@ Window { } highlightMoveDuration: -1; highlightMoveVelocity: -1; - highlight: Rectangle { color: "transparent"; border.width: 2; border.color: "#1FA5E8"; z: 1; } + highlight: Rectangle { color: "transparent"; border.width: 4; border.color: "#1DB5ED"; z: 1; } + leftMargin: 50; // Start the first item over be about the same amount as the last item peeks through on the other side. + rightMargin: 50; + } + Image { // Just a visual indicator that the user can swipe the cards over to see more. + source: "../images/Swipe-Icon-single.svg" + width: 50; + anchors { + right: scroll.right; + verticalCenter: scroll.verticalCenter; + } } - Image { id: backgroundImage source: "../images/address-bar.svg"