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

Tweak top bar

Browse source
This commit is contained in:
Zach Fox 2019-05-14 12:41:56 -07:00
parent 8724cf4edf
commit f43c376a6a
2 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
View file

@ -48,10 +48,9 @@ Rectangle {
} }
} }
height: parent.height; height: 30;
width: 40; width: 34;
radius: 5;
opacity: 0.7; opacity: 0.7;
onLevelChanged: { onLevelChanged: {
@ -108,11 +107,11 @@ Rectangle {
} }
Item { Item {
id: icon; id: icon
width: parent.width - bar.width - bar.anchors.leftMargin;
height: parent.height - 4;
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
width: parent.width - bar.width - bar.anchors.leftMargin
height: parent.height
Item { Item {
anchors.fill: parent anchors.fill: parent
@ -143,8 +142,8 @@ Rectangle {
verticalCenter: icon.verticalCenter; verticalCenter: icon.verticalCenter;
} }
width: 6; width: 4;
height: parent.height - 12; height: parent.height;
Rectangle { // base Rectangle { // base
id: baseBar id: baseBar

21
interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
View file

@ -116,11 +116,11 @@ Rectangle {
Item { Item {
id: avatarButtonContainer id: avatarButtonContainer
anchors.top: parent.top anchors.verticalCenter: parent.verticalCenter
anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 16 anchors.leftMargin: 16
width: height width: 48
height: width
AnimatedImage { AnimatedImage {
visible: avatarButtonImage.source === "" visible: avatarButtonImage.source === ""
@ -192,20 +192,19 @@ Rectangle {
InputDeviceButton.InputDeviceButton { InputDeviceButton.InputDeviceButton {
id: inputDeviceButton id: inputDeviceButton
anchors.verticalCenter: parent.verticalCenter
anchors.left: avatarButtonContainer.right anchors.left: avatarButtonContainer.right
anchors.leftMargin: 8 anchors.leftMargin: 8
anchors.top: parent.top
anchors.bottom: parent.bottom
} }
Item { Item {
id: outputDeviceButtonContainer id: outputDeviceButtonContainer
anchors.verticalCenter: parent.verticalCenter
anchors.left: inputDeviceButton.right anchors.left: inputDeviceButton.right
anchors.leftMargin: 8 anchors.leftMargin: 24
anchors.top: parent.top width: 20
anchors.bottom: parent.bottom height: width
width: 40
HifiStylesUit.HiFiGlyphs { HifiStylesUit.HiFiGlyphs {
property bool outputMuted: false property bool outputMuted: false
@ -213,9 +212,9 @@ Rectangle {
text: (outputDeviceButton.outputMuted ? simplifiedUI.glyphs.vol_0 : simplifiedUI.glyphs.vol_3) text: (outputDeviceButton.outputMuted ? simplifiedUI.glyphs.vol_0 : simplifiedUI.glyphs.vol_3)
color: (outputDeviceButton.outputMuted ? simplifiedUI.colors.controls.outputVolumeButton.text.muted : simplifiedUI.colors.controls.outputVolumeButton.text.noisy) color: (outputDeviceButton.outputMuted ? simplifiedUI.colors.controls.outputVolumeButton.text.muted : simplifiedUI.colors.controls.outputVolumeButton.text.noisy)
opacity: outputDeviceButtonMouseArea.containsMouse ? 1.0 : 0.7 opacity: outputDeviceButtonMouseArea.containsMouse ? 1.0 : 0.7
size: 40 size: 32
anchors.centerIn: parent anchors.centerIn: parent
width: 35 width: parent.width
height: parent.height height: parent.height
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
MouseArea { MouseArea {