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

Force Qt (rather than OS) rendering in a number of places

Browse source
This commit is contained in:
Bradley Austin Davis 2016-02-03 10:33:11 -08:00
parent 0a99086617
commit 320c4d27b5
12 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/controls/CheckBox.qml
View file

@ -10,7 +10,8 @@ Original.CheckBox {
}
label: Text {
text: control.text
renderType: Text.QtRendering
}
}
}
}

7
interface/resources/qml/controls/TextField.qml Normal file
View file

@ -0,0 +1,7 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
TextField {
style: TextFieldStyle { renderType: Text.QtRendering }
}

3
interface/resources/qml/dialogs/FileDialog.qml
View file

@ -2,6 +2,7 @@ import QtQuick 2.0
import QtQuick.Controls 1.4
import Qt.labs.folderlistmodel 2.1
import Qt.labs.settings 1.0
import QtQuick.Controls.Styles 1.4
import ".."
import "../windows"
@ -82,6 +83,7 @@ ModalWindow {
TextField {
id: currentDirectory
height: homeButton.height
style: TextFieldStyle { renderType: Text.QtRendering }
anchors { left: navControls.right; right: parent.right; top: parent.top; margins: 8 }
property var lastValidFolder: helper.urlToPath(model.folder)
onLastValidFolderChanged: text = lastValidFolder;
@ -181,6 +183,7 @@ ModalWindow {
TextField {
id: currentSelection
style: TextFieldStyle { renderType: Text.QtRendering }
anchors { right: root.selectDirectory ? parent.right : selectionType.left; rightMargin: 8; left: parent.left; leftMargin: 8; top: selectionType.top }
readOnly: true
activeFocusOnTab: false

2
interface/resources/qml/dialogs/QueryDialog.qml
View file

@ -62,7 +62,7 @@ ModalWindow {
Item {
anchors { top: mainTextContainer.bottom; bottom: buttons.top; left: parent.left; right: parent.right; margins: d.spacing }
// FIXME make a text field type that can be bound to a history for autocompletion
TextField {
VrControls.TextField {
id: textResult
focus: items ? false : true
visible: items ? false : true

4
interface/resources/qml/dialogs/RunningScripts.qml
View file

@ -219,7 +219,7 @@ Window {
}
}
TextField {
HifiControls.TextField {
id: filterEdit
anchors.left: parent.left
anchors.right: parent.right
@ -252,7 +252,7 @@ Window {
TableViewColumn { title: "Name"; role: "display"; }
}
TextField {
HifiControls.TextField {
id: selectedScript
readOnly: true
anchors.left: parent.left

2
interface/resources/qml/dialogs/preferences/AvatarPreference.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
Preference {
id: root
@ -50,6 +51,7 @@ Preference {
id: dataTextField
placeholderText: root.placeholderText
text: preference.value
style: TextFieldStyle { renderType: Text.QtRendering }
anchors {
top: labelText.bottom
left: parent.left

2
interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import "../../dialogs"
@ -30,6 +31,7 @@ Preference {
id: dataTextField
placeholderText: root.placeholderText
text: preference.value
style: TextFieldStyle { renderType: Text.QtRendering }
anchors {
top: labelText.bottom
left: parent.left

1
interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../controls"
Preference {
id: root

2
interface/resources/qml/dialogs/preferences/EditablePreference.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
Preference {
id: root
@ -24,6 +25,7 @@ Preference {
TextField {
id: dataTextField
placeholderText: preference.placeholderText
style: TextFieldStyle { renderType: Text.QtRendering }
anchors {
top: labelText.bottom
left: parent.left

2
interface/resources/qml/hifi/dialogs/AvatarAttachmentsDialog.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.XmlListModel 2.0
import QtQuick.Controls.Styles 1.4
import "../../windows"
import "../../js/Utils.js" as Utils
@ -27,6 +28,7 @@ ModalWindow {
TextField {
id: filterEdit
anchors { left: parent.left; right: parent.right; top: parent.top }
style: TextFieldStyle { renderType: Text.QtRendering }
placeholderText: "filter"
onTextChanged: tableView.model.filter = text
}

2
interface/resources/qml/hifi/dialogs/ModelBrowserDialog.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.XmlListModel 2.0
import QtQuick.Controls.Styles 1.4
import "../../windows"
import "../../js/Utils.js" as Utils
@ -26,6 +27,7 @@ ModalWindow {
TextField {
id: filterEdit
style: TextFieldStyle { renderType: Text.QtRendering }
anchors { left: parent.left; right: parent.right; top: parent.top }
placeholderText: "filter"
onTextChanged: tableView.model.filter = text

3
interface/resources/qml/hifi/dialogs/attachments/Attachment.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import "../../../windows"
import "../../../controls" as VrControls
@ -31,7 +32,7 @@ Item {
height: modelChooserButton.height
anchors { left: parent.left; right: parent.right; }
Text { id: urlLabel; text: "Model URL:"; width: 80; anchors.verticalCenter: modelUrl.verticalCenter }
TextField {
VrControls.TextField {
id: modelUrl;
height: jointChooser.height;
anchors { left: urlLabel.right; leftMargin: 8; rightMargin: 8; right: modelChooserButton.left }