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

Wrap text in query dialogs. Add right margins for input field and buttons

Browse source
This commit is contained in:
vladest 2018-03-04 13:19:56 +01:00
parent 8856d4af4f
commit 2a9bbfa808
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/controls-uit/TextField.qml
View file

@ -165,8 +165,10 @@ TextField {
text: textField.label text: textField.label
colorScheme: textField.colorScheme colorScheme: textField.colorScheme
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.top anchors.bottom: parent.top
anchors.bottomMargin: 3 anchors.bottomMargin: 3
wrapMode: Text.WordWrap
visible: label != "" visible: label != ""
} }
} }

8
interface/resources/qml/dialogs/TabletQueryDialog.qml
View file

@ -72,13 +72,13 @@ TabletModalWindow {
QtObject { QtObject {
id: d id: d
readonly property int minWidth: 470 readonly property int minWidth: modalWindowItem.width
readonly property int maxWidth: 470 readonly property int maxWidth: modalWindowItem.width
readonly property int minHeight: 120 readonly property int minHeight: 120
readonly property int maxHeight: 720 readonly property int maxHeight: 720
function resize() { function resize() {
var targetWidth = Math.max(titleWidth, 470) var targetWidth = Math.max(titleWidth, modalWindowItem.width)
var targetHeight = (items ? comboBox.controlHeight : textResult.controlHeight) + 5 * hifi.dimensions.contentSpacing.y + buttons.height var targetHeight = (items ? comboBox.controlHeight : textResult.controlHeight) + 5 * hifi.dimensions.contentSpacing.y + buttons.height
modalWindowItem.width = (targetWidth < d.minWidth) ? d.minWidth : ((targetWidth > d.maxWdith) ? d.maxWidth : targetWidth); modalWindowItem.width = (targetWidth < d.minWidth) ? d.minWidth : ((targetWidth > d.maxWdith) ? d.maxWidth : targetWidth);
modalWindowItem.height = ((targetHeight < d.minHeight) ? d.minHeight : ((targetHeight > d.maxHeight) ? d.maxHeight : targetHeight)) + ((keyboardEnabled && keyboardRaised) ? (keyboard.raisedHeight + 2 * hifi.dimensions.contentSpacing.y) : 0) + modalWindowItem.frameMarginTop modalWindowItem.height = ((targetHeight < d.minHeight) ? d.minHeight : ((targetHeight > d.maxHeight) ? d.maxHeight : targetHeight)) + ((keyboardEnabled && keyboardRaised) ? (keyboard.raisedHeight + 2 * hifi.dimensions.contentSpacing.y) : 0) + modalWindowItem.frameMarginTop
@ -106,6 +106,7 @@ TabletModalWindow {
right: parent.right; right: parent.right;
bottom: parent.bottom bottom: parent.bottom
leftMargin: 5 leftMargin: 5
rightMargin: 5
} }
} }
@ -150,6 +151,7 @@ TabletModalWindow {
bottom: parent.bottom bottom: parent.bottom
right: parent.right right: parent.right
margins: 0 margins: 0
rightMargin: hifi.dimensions.borderRadius
bottomMargin: hifi.dimensions.contentSpacing.y bottomMargin: hifi.dimensions.contentSpacing.y
} }
Button { action: cancelAction } Button { action: cancelAction }

4
interface/src/scripting/AssetMappingsScriptingInterface.cpp
View file

@ -69,11 +69,11 @@ void AssetMappingsScriptingInterface::getMapping(QString path, QJSValue callback
void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping, QJSValue startedCallback, QJSValue completedCallback, bool dropEvent) { void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping, QJSValue startedCallback, QJSValue completedCallback, bool dropEvent) {
static const QString helpText = static const QString helpText =
"Upload your asset to a specific folder by entering the full path. Specifying\n" "Upload your asset to a specific folder by entering the full path. Specifying"
"a new folder name will automatically create that folder for you."; "a new folder name will automatically create that folder for you.";
static const QString dropHelpText = static const QString dropHelpText =
"This file will be added to your Asset Server.\n" "This file will be added to your Asset Server.\n"
"Use the field below to place your file in a specific folder or to rename it.\n" "Use the field below to place your file in a specific folder or to rename it. "
"Specifying a new folder name will automatically create that folder for you."; "Specifying a new folder name will automatically create that folder for you.";
auto offscreenUi = DependencyManager::get<OffscreenUi>(); auto offscreenUi = DependencyManager::get<OffscreenUi>();