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

style updates

Browse source
This commit is contained in:
David Kelly 2017-03-01 12:43:45 -07:00
parent 1fc57ce9a6
commit 55d049ff5c
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/fonts/hifi-glyphs.ttf
View file

Binary file not shown.

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

@ -56,7 +56,7 @@ Item {
id: textContainer id: textContainer
// Size // Size
width: parent.width - /*avatarImage.width - parent.spacing - */parent.anchors.leftMargin - parent.anchors.rightMargin width: parent.width - /*avatarImage.width - parent.spacing - */parent.anchors.leftMargin - parent.anchors.rightMargin
height: childrenRect.height height: selected || isMyCard ? childrenRect.height : childrenRect.height - 20
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
// DisplayName field for my card // DisplayName field for my card
@ -274,6 +274,7 @@ Item {
// Style // Style
radius: 4 radius: 4
color: "#c5c5c5" color: "#c5c5c5"
visible: isMyCard || selected
// Rectangle for the zero-gain point on the VU meter // Rectangle for the zero-gain point on the VU meter
Rectangle { Rectangle {
id: vuMeterZeroGain id: vuMeterZeroGain
@ -304,6 +305,7 @@ Item {
id: vuMeterBase id: vuMeterBase
// Anchors // Anchors
anchors.fill: parent anchors.fill: parent
visible: isMyCard || selected
// Style // Style
color: parent.color color: parent.color
radius: parent.radius radius: parent.radius
@ -311,6 +313,7 @@ Item {
// Rectangle for the VU meter audio level // Rectangle for the VU meter audio level
Rectangle { Rectangle {
id: vuMeterLevel id: vuMeterLevel
visible: isMyCard || selected
// Size // Size
width: (thisNameCard.audioLevel) * parent.width width: (thisNameCard.audioLevel) * parent.width
// Style // Style

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

@ -200,7 +200,7 @@ Rectangle {
TableViewColumn { TableViewColumn {
role: "avgAudioLevel" role: "avgAudioLevel"
title: "VOL" title: "LOUD"
width: actionButtonWidth width: actionButtonWidth
movable: false movable: false
resizable: false resizable: false
@ -244,7 +244,7 @@ Rectangle {
// This Rectangle refers to each Row in the table. // This Rectangle refers to each Row in the table.
rowDelegate: Rectangle { // The only way I know to specify a row height. rowDelegate: Rectangle { // The only way I know to specify a row height.
// Size // Size
height: rowHeight height: styleData.selected ? rowHeight : rowHeight - 20
color: styleData.selected color: styleData.selected
? hifi.colors.orangeHighlight ? hifi.colors.orangeHighlight
: styleData.alternate ? hifi.colors.tableRowLightEven : hifi.colors.tableRowLightOdd : styleData.alternate ? hifi.colors.tableRowLightEven : hifi.colors.tableRowLightOdd