Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-08 04:27:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

align combobox to accept/cancel buttons, otherwise stretch to buttons area

Browse source
This commit is contained in:
Alexander Ivash 2018-03-16 22:38:39 +03:00
parent 9ec10bbb7e
commit 91488bbbeb
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/resources/qml/dialogs/CustomQueryDialog.qml
View file

@ -122,12 +122,6 @@ ModalWindow {
root.width = (targetWidth < d.minWidth) ? d.minWidth : ((targetWidth > d.maxWdith) ? d.maxWidth : targetWidth); root.width = (targetWidth < d.minWidth) ? d.minWidth : ((targetWidth > d.maxWdith) ? d.maxWidth : targetWidth);
root.height = (targetHeight < d.minHeight) ? d.minHeight : ((targetHeight > d.maxHeight) ? root.height = (targetHeight < d.minHeight) ? d.minHeight : ((targetHeight > d.maxHeight) ?
d.maxHeight : targetHeight); d.maxHeight : targetHeight);
if (checkBoxField.visible && comboBoxField.visible) {
checkBoxField.width = extraInputs.width / 2;
comboBoxField.width = extraInputs.width / 2;
} else if (!checkBoxField.visible && comboBoxField.visible) {
comboBoxField.width = extraInputs.width;
}
} }
} }
@ -198,6 +192,15 @@ ModalWindow {
label: root.comboBox.label; label: root.comboBox.label;
focus: Boolean(root.comboBox); focus: Boolean(root.comboBox);
visible: Boolean(root.comboBox); visible: Boolean(root.comboBox);
Binding on x {
when: comboBoxField.visible
value: !checkBoxField.visible ? buttons.x : acceptButton.x
}
Binding on width {
when: comboBoxField.visible
value: !checkBoxField.visible ? buttons.width : buttons.width - acceptButton.x
}
anchors { anchors {
right: parent.right; right: parent.right;
bottom: parent.bottom; bottom: parent.bottom;

15
interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
View file

@ -140,12 +140,6 @@ TabletModalWindow {
root.width = (targetWidth < d.minWidth) ? d.minWidth : ((targetWidth > d.maxWdith) ? d.maxWidth : targetWidth); root.width = (targetWidth < d.minWidth) ? d.minWidth : ((targetWidth > d.maxWdith) ? d.maxWidth : targetWidth);
modalWindowItem.height = (targetHeight < d.minHeight) ? d.minHeight : ((targetHeight > d.maxHeight) ? modalWindowItem.height = (targetHeight < d.minHeight) ? d.minHeight : ((targetHeight > d.maxHeight) ?
d.maxHeight : targetHeight); d.maxHeight : targetHeight);
if (checkBoxField.visible && comboBoxField.visible) {
checkBoxField.width = extraInputs.width / 2;
comboBoxField.width = extraInputs.width / 2;
} else if (!checkBoxField.visible && comboBoxField.visible) {
comboBoxField.width = extraInputs.width;
}
} }
} }
@ -223,6 +217,15 @@ TabletModalWindow {
label: root.comboBox.label; label: root.comboBox.label;
focus: Boolean(root.comboBox); focus: Boolean(root.comboBox);
visible: Boolean(root.comboBox); visible: Boolean(root.comboBox);
Binding on x {
when: comboBoxField.visible
value: !checkBoxField.visible ? buttons.x : acceptButton.x
}
Binding on width {
when: comboBoxField.visible
value: !checkBoxField.visible ? buttons.width : buttons.width - acceptButton.x
}
anchors { anchors {
right: parent.right; right: parent.right;
bottom: parent.bottom; bottom: parent.bottom;