Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 11:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching

Browse source
This commit is contained in:
ZappoMan 2015-06-03 13:00:30 -07:00
commit 6ba8d7e46b
8 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/AddressBarDialog.qml
View file

@ -22,6 +22,7 @@ Item {
property int animationDuration: hifi.effects.fadeInDuration
property bool destroyOnInvisible: false
property real scale: 1.25 // Make this dialog a little larger than normal
implicitWidth: addressBarDialog.implicitWidth
implicitHeight: addressBarDialog.implicitHeight
@ -41,9 +42,9 @@ Item {
id: backgroundImage
source: "../images/address-bar.svg"
width: 576
height: 80
property int inputAreaHeight: 56 // Height of the background's input area
width: 576 * root.scale
height: 80 * root.scale
property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area
property int inputAreaStep: (height - inputAreaHeight) / 2
TextInput {
@ -58,7 +59,8 @@ Item {
}
font.pointSize: 15
font.pixelSize: hifi.fonts.pixelSize * root.scale
helperText: "Go to: place, @user, /path, network address"
onAccepted: {

2
interface/resources/qml/controls/SpinBox.qml
View file

@ -9,7 +9,7 @@ Original.SpinBox {
style: SpinBoxStyle {
HifiConstants { id: hifi }
font.family: hifi.fonts.fontFamily
font.pointSize: hifi.fonts.fontSize
font.pixelSize: hifi.fonts.pixelSize
}
}

2
interface/resources/qml/controls/Text.qml
View file

@ -4,6 +4,6 @@ import "../styles"
Original.Text {
HifiConstants { id: hifi }
font.family: hifi.fonts.fontFamily
font.pointSize: hifi.fonts.fontSize
font.pixelSize: hifi.fonts.pixelSize
}

2
interface/resources/qml/controls/TextArea.qml
View file

@ -4,6 +4,6 @@ import "../styles"
Original.TextArea {
HifiConstants { id: hifi }
font.family: hifi.fonts.fontFamily
font.pointSize: hifi.fonts.fontSize
font.pixelSize: hifi.fonts.pixelSize
}

2
interface/resources/qml/controls/TextEdit.qml
View file

@ -4,6 +4,6 @@ import "../styles"
Original.TextEdit {
HifiConstants { id: hifi }
font.family: hifi.fonts.fontFamily
font.pointSize: hifi.fonts.fontSize
font.pixelSize: hifi.fonts.pixelSize
}

2
interface/resources/qml/controls/TextHeader.qml
View file

@ -4,6 +4,6 @@ import "../styles"
Text {
HifiConstants { id: hifi }
color: hifi.colors.hifiBlue
font.pointSize: hifi.fonts.headerPointSize
font.pixelSize: hifi.fonts.headerPixelSize
font.bold: true
}

4
interface/resources/qml/controls/TextInput.qml
View file

@ -11,7 +11,7 @@ Original.TextInput {
color: hifi.colors.text
verticalAlignment: Original.TextInput.AlignVCenter
font.family: hifi.fonts.fontFamily
font.pointSize: hifi.fonts.fontSize
font.pixelSize: hifi.fonts.pixelSize
/*
Original.Rectangle {
@ -23,7 +23,7 @@ Original.TextInput {
*/
Text {
anchors.fill: parent
font.pointSize: parent.font.pointSize
font.pixelSize: parent.font.pixelSize
font.family: parent.font.family
verticalAlignment: parent.verticalAlignment
horizontalAlignment: parent.horizontalAlignment

8
interface/resources/qml/styles/HifiConstants.qml
View file

@ -18,7 +18,7 @@ Item {
readonly property color background: sysPalette.dark
readonly property color text: sysPalette.text
readonly property color disabledText: "gray"
readonly property color hintText: sysPalette.dark
readonly property color hintText: "gray" // A bit darker than sysPalette.dark so that it is visible on the DK2
readonly property color light: sysPalette.light
readonly property alias activeWindow: activeWindow
readonly property alias inactiveWindow: inactiveWindow
@ -36,9 +36,9 @@ Item {
QtObject {
id: fonts
readonly property real headerPointSize: 24
readonly property string fontFamily: "Helvetica"
readonly property real fontSize: 18
readonly property string fontFamily: "Arial" // Available on both Windows and OSX
readonly property real pixelSize: 22 // Logical pixel size; works on Windows and OSX at varying physical DPIs
readonly property real headerPixelSize: 32
}
QtObject {