From f73c2b884dfa3ea4e3eb657d56ed19983f79bef0 Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Fri, 15 Jul 2016 17:01:37 -0700 Subject: [PATCH] Remove now-superflous Column. --- interface/resources/qml/AddressBarDialog.qml | 40 ++++++++++---------- interface/resources/qml/hifi/Card.qml | 3 +- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index b739842d1c..edc69d7c7d 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -59,7 +59,7 @@ Window { implicitWidth: backgroundImage.width implicitHeight: backgroundImage.height - Column { + Row { width: backgroundImage.width; anchors { bottom: backgroundImage.top; @@ -67,26 +67,24 @@ Window { right: backgroundImage.right; rightMargin: -104; // FIXME } - Row { - spacing: hifi.layout.spacing; - Card { - id: s0; - width: cardWidth; - height: cardHeight; - goFunction: goCard - } - Card { - id: s1; - width: cardWidth; - height: cardHeight; - goFunction: goCard - } - Card { - id: s2; - width: cardWidth; - height: cardHeight; - goFunction: goCard - } + spacing: hifi.layout.spacing; + Card { + id: s0; + width: cardWidth; + height: cardHeight; + goFunction: goCard + } + Card { + id: s1; + width: cardWidth; + height: cardHeight; + goFunction: goCard + } + Card { + id: s2; + width: cardWidth; + height: cardHeight; + goFunction: goCard } } diff --git a/interface/resources/qml/hifi/Card.qml b/interface/resources/qml/hifi/Card.qml index b4a709215f..7758c5800a 100644 --- a/interface/resources/qml/hifi/Card.qml +++ b/interface/resources/qml/hifi/Card.qml @@ -24,8 +24,7 @@ Rectangle { property alias usersText: users.text; property int textPadding: 20; property int textSize: 24; - // FIXME: let's get our own - property string defaultPicture: "http://www.davidluke.com/wp-content/themes/david-luke/media/ims/placeholder720.gif"; + property string defaultPicture: "../../images/default-domain.gif"; HifiConstants { id: hifi } Image { id: lobby;