From 503468e49b865f341ffdcfd7a965b12b1a959f39 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 10 Jan 2017 17:20:25 -0800 Subject: [PATCH] Style changes --- interface/resources/qml/hifi/NameCard.qml | 19 +++++++++++++++++-- interface/resources/qml/hifi/Pal.qml | 6 +++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml index 18dbaf1fe1..1f4ef07131 100644 --- a/interface/resources/qml/hifi/NameCard.qml +++ b/interface/resources/qml/hifi/NameCard.qml @@ -11,6 +11,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.0 import "../styles-uit" @@ -28,7 +29,7 @@ Row { } // Properties - property int contentHeight: isMyCard ? 50 : 70 + property int contentHeight: 70 property string uuid: "" property string displayName: "" property string userName: "" @@ -153,13 +154,27 @@ Row { id: gainSlider visible: !isMyCard width: parent.width - height: 16 + height: 18 value: 1.0 minimumValue: 0.0 maximumValue: 1.5 stepSize: 0.1 updateValueWhileDragging: false onValueChanged: updateGainFromQML(uuid, value) + style: SliderStyle { + groove: Rectangle { + color: "#dbdbdb" + implicitWidth: gainSlider.width + implicitHeight: 4 + radius: 2 + } + handle: Rectangle { + anchors.centerIn: parent + color: (control.pressed || control.hovered) ? "#00b4ef" : "#8F8F8F" + implicitWidth: 10 + implicitHeight: 18 + } + } } } diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 4f65497da5..2cc07bf90d 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -24,8 +24,8 @@ Rectangle { // Style color: "#E3E3E3" // Properties - property int myCardHeight: 70 - property int rowHeight: 70 + property int myCardHeight: 90 + property int rowHeight: 90 property int actionButtonWidth: 75 property int nameCardWidth: palContainer.width - actionButtonWidth*(iAmAdmin ? 4 : 2) - 4 - hifi.dimensions.scrollbarBackgroundWidth property var myData: ({displayName: "", userName: "", audioLevel: 0.0}) // valid dummy until set @@ -51,7 +51,7 @@ Rectangle { id: myInfo // Size width: palContainer.width - height: myCardHeight + 20 + height: myCardHeight // Style color: pal.color // Anchors