mirror of
https://github.com/JulianGro/overte.git
synced 2025-05-28 02:51:04 +02:00
Force Qt (rather than OS) rendering in a number of places
This commit is contained in:
parent
0a99086617
commit
320c4d27b5
12 changed files with 29 additions and 6 deletions
|
@ -10,7 +10,8 @@ Original.CheckBox {
|
||||||
}
|
}
|
||||||
label: Text {
|
label: Text {
|
||||||
text: control.text
|
text: control.text
|
||||||
|
renderType: Text.QtRendering
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
7
interface/resources/qml/controls/TextField.qml
Normal file
7
interface/resources/qml/controls/TextField.qml
Normal 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 }
|
||||||
|
}
|
|
@ -2,6 +2,7 @@ import QtQuick 2.0
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
import Qt.labs.folderlistmodel 2.1
|
import Qt.labs.folderlistmodel 2.1
|
||||||
import Qt.labs.settings 1.0
|
import Qt.labs.settings 1.0
|
||||||
|
import QtQuick.Controls.Styles 1.4
|
||||||
|
|
||||||
import ".."
|
import ".."
|
||||||
import "../windows"
|
import "../windows"
|
||||||
|
@ -82,6 +83,7 @@ ModalWindow {
|
||||||
TextField {
|
TextField {
|
||||||
id: currentDirectory
|
id: currentDirectory
|
||||||
height: homeButton.height
|
height: homeButton.height
|
||||||
|
style: TextFieldStyle { renderType: Text.QtRendering }
|
||||||
anchors { left: navControls.right; right: parent.right; top: parent.top; margins: 8 }
|
anchors { left: navControls.right; right: parent.right; top: parent.top; margins: 8 }
|
||||||
property var lastValidFolder: helper.urlToPath(model.folder)
|
property var lastValidFolder: helper.urlToPath(model.folder)
|
||||||
onLastValidFolderChanged: text = lastValidFolder;
|
onLastValidFolderChanged: text = lastValidFolder;
|
||||||
|
@ -181,6 +183,7 @@ ModalWindow {
|
||||||
|
|
||||||
TextField {
|
TextField {
|
||||||
id: currentSelection
|
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 }
|
anchors { right: root.selectDirectory ? parent.right : selectionType.left; rightMargin: 8; left: parent.left; leftMargin: 8; top: selectionType.top }
|
||||||
readOnly: true
|
readOnly: true
|
||||||
activeFocusOnTab: false
|
activeFocusOnTab: false
|
||||||
|
|
|
@ -62,7 +62,7 @@ ModalWindow {
|
||||||
Item {
|
Item {
|
||||||
anchors { top: mainTextContainer.bottom; bottom: buttons.top; left: parent.left; right: parent.right; margins: d.spacing }
|
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
|
// FIXME make a text field type that can be bound to a history for autocompletion
|
||||||
TextField {
|
VrControls.TextField {
|
||||||
id: textResult
|
id: textResult
|
||||||
focus: items ? false : true
|
focus: items ? false : true
|
||||||
visible: items ? false : true
|
visible: items ? false : true
|
||||||
|
|
|
@ -219,7 +219,7 @@ Window {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TextField {
|
HifiControls.TextField {
|
||||||
id: filterEdit
|
id: filterEdit
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
@ -252,7 +252,7 @@ Window {
|
||||||
TableViewColumn { title: "Name"; role: "display"; }
|
TableViewColumn { title: "Name"; role: "display"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
TextField {
|
HifiControls.TextField {
|
||||||
id: selectedScript
|
id: selectedScript
|
||||||
readOnly: true
|
readOnly: true
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import QtQuick 2.5
|
import QtQuick 2.5
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
|
import QtQuick.Controls.Styles 1.4
|
||||||
|
|
||||||
Preference {
|
Preference {
|
||||||
id: root
|
id: root
|
||||||
|
@ -50,6 +51,7 @@ Preference {
|
||||||
id: dataTextField
|
id: dataTextField
|
||||||
placeholderText: root.placeholderText
|
placeholderText: root.placeholderText
|
||||||
text: preference.value
|
text: preference.value
|
||||||
|
style: TextFieldStyle { renderType: Text.QtRendering }
|
||||||
anchors {
|
anchors {
|
||||||
top: labelText.bottom
|
top: labelText.bottom
|
||||||
left: parent.left
|
left: parent.left
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
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 "../../dialogs"
|
import "../../dialogs"
|
||||||
|
|
||||||
|
@ -30,6 +31,7 @@ Preference {
|
||||||
id: dataTextField
|
id: dataTextField
|
||||||
placeholderText: root.placeholderText
|
placeholderText: root.placeholderText
|
||||||
text: preference.value
|
text: preference.value
|
||||||
|
style: TextFieldStyle { renderType: Text.QtRendering }
|
||||||
anchors {
|
anchors {
|
||||||
top: labelText.bottom
|
top: labelText.bottom
|
||||||
left: parent.left
|
left: parent.left
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import QtQuick 2.5
|
import QtQuick 2.5
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
|
import "../../controls"
|
||||||
|
|
||||||
Preference {
|
Preference {
|
||||||
id: root
|
id: root
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import QtQuick 2.5
|
import QtQuick 2.5
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
|
import QtQuick.Controls.Styles 1.4
|
||||||
|
|
||||||
Preference {
|
Preference {
|
||||||
id: root
|
id: root
|
||||||
|
@ -24,6 +25,7 @@ Preference {
|
||||||
TextField {
|
TextField {
|
||||||
id: dataTextField
|
id: dataTextField
|
||||||
placeholderText: preference.placeholderText
|
placeholderText: preference.placeholderText
|
||||||
|
style: TextFieldStyle { renderType: Text.QtRendering }
|
||||||
anchors {
|
anchors {
|
||||||
top: labelText.bottom
|
top: labelText.bottom
|
||||||
left: parent.left
|
left: parent.left
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import QtQuick 2.5
|
import QtQuick 2.5
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
import QtQuick.XmlListModel 2.0
|
import QtQuick.XmlListModel 2.0
|
||||||
|
import QtQuick.Controls.Styles 1.4
|
||||||
|
|
||||||
import "../../windows"
|
import "../../windows"
|
||||||
import "../../js/Utils.js" as Utils
|
import "../../js/Utils.js" as Utils
|
||||||
|
@ -27,6 +28,7 @@ ModalWindow {
|
||||||
TextField {
|
TextField {
|
||||||
id: filterEdit
|
id: filterEdit
|
||||||
anchors { left: parent.left; right: parent.right; top: parent.top }
|
anchors { left: parent.left; right: parent.right; top: parent.top }
|
||||||
|
style: TextFieldStyle { renderType: Text.QtRendering }
|
||||||
placeholderText: "filter"
|
placeholderText: "filter"
|
||||||
onTextChanged: tableView.model.filter = text
|
onTextChanged: tableView.model.filter = text
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import QtQuick 2.5
|
import QtQuick 2.5
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
import QtQuick.XmlListModel 2.0
|
import QtQuick.XmlListModel 2.0
|
||||||
|
import QtQuick.Controls.Styles 1.4
|
||||||
|
|
||||||
import "../../windows"
|
import "../../windows"
|
||||||
import "../../js/Utils.js" as Utils
|
import "../../js/Utils.js" as Utils
|
||||||
|
@ -26,6 +27,7 @@ ModalWindow {
|
||||||
|
|
||||||
TextField {
|
TextField {
|
||||||
id: filterEdit
|
id: filterEdit
|
||||||
|
style: TextFieldStyle { renderType: Text.QtRendering }
|
||||||
anchors { left: parent.left; right: parent.right; top: parent.top }
|
anchors { left: parent.left; right: parent.right; top: parent.top }
|
||||||
placeholderText: "filter"
|
placeholderText: "filter"
|
||||||
onTextChanged: tableView.model.filter = text
|
onTextChanged: tableView.model.filter = text
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
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 "../../../windows"
|
import "../../../windows"
|
||||||
import "../../../controls" as VrControls
|
import "../../../controls" as VrControls
|
||||||
|
@ -31,7 +32,7 @@ Item {
|
||||||
height: modelChooserButton.height
|
height: modelChooserButton.height
|
||||||
anchors { left: parent.left; right: parent.right; }
|
anchors { left: parent.left; right: parent.right; }
|
||||||
Text { id: urlLabel; text: "Model URL:"; width: 80; anchors.verticalCenter: modelUrl.verticalCenter }
|
Text { id: urlLabel; text: "Model URL:"; width: 80; anchors.verticalCenter: modelUrl.verticalCenter }
|
||||||
TextField {
|
VrControls.TextField {
|
||||||
id: modelUrl;
|
id: modelUrl;
|
||||||
height: jointChooser.height;
|
height: jointChooser.height;
|
||||||
anchors { left: urlLabel.right; leftMargin: 8; rightMargin: 8; right: modelChooserButton.left }
|
anchors { left: urlLabel.right; leftMargin: 8; rightMargin: 8; right: modelChooserButton.left }
|
||||||
|
|
Loading…
Reference in a new issue