Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 00:17:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Style changes

Browse source
This commit is contained in:
Zach Fox 2017-01-10 17:20:25 -08:00
parent dcff873cd4
commit 503468e49b
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
interface/resources/qml/hifi/NameCard.qml
View file

@ -11,6 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "../styles-uit" import "../styles-uit"
@ -28,7 +29,7 @@ Row {
} }
// Properties // Properties
property int contentHeight: isMyCard ? 50 : 70 property int contentHeight: 70
property string uuid: "" property string uuid: ""
property string displayName: "" property string displayName: ""
property string userName: "" property string userName: ""
@ -153,13 +154,27 @@ Row {
id: gainSlider id: gainSlider
visible: !isMyCard visible: !isMyCard
width: parent.width width: parent.width
height: 16 height: 18
value: 1.0 value: 1.0
minimumValue: 0.0 minimumValue: 0.0
maximumValue: 1.5 maximumValue: 1.5
stepSize: 0.1 stepSize: 0.1
updateValueWhileDragging: false updateValueWhileDragging: false
onValueChanged: updateGainFromQML(uuid, value) 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
}
}
} }
} }

6
interface/resources/qml/hifi/Pal.qml
View file

@ -24,8 +24,8 @@ Rectangle {
// Style // Style
color: "#E3E3E3" color: "#E3E3E3"
// Properties // Properties
property int myCardHeight: 70 property int myCardHeight: 90
property int rowHeight: 70 property int rowHeight: 90
property int actionButtonWidth: 75 property int actionButtonWidth: 75
property int nameCardWidth: palContainer.width - actionButtonWidth*(iAmAdmin ? 4 : 2) - 4 - hifi.dimensions.scrollbarBackgroundWidth 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 property var myData: ({displayName: "", userName: "", audioLevel: 0.0}) // valid dummy until set
@ -51,7 +51,7 @@ Rectangle {
id: myInfo id: myInfo
// Size // Size
width: palContainer.width width: palContainer.width
height: myCardHeight + 20 height: myCardHeight
// Style // Style
color: pal.color color: pal.color
// Anchors // Anchors