Skip to content

Commit 0d460e7

Browse files
authored
bugfix: fix to title alignment with GUI scale (#398)
* Fix title alignment with GUI scale * style changes
1 parent 57125a1 commit 0d460e7

File tree

1 file changed

+35
-9
lines changed

1 file changed

+35
-9
lines changed

inst/qml/doeAnalysis.qml

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,16 @@ Form
155155
listViewType : JASP.AssignedVariables
156156
draggable : false
157157
preferredHeight : jaspTheme.smallDefaultVariablesFormHeight
158-
rowComponentTitle : qsTr("Low High ")
158+
159+
RowLayout
160+
{
161+
id: rowTitle
162+
anchors.right: parent.right
163+
spacing: 2
164+
165+
Text { text: qsTr("Low"); horizontalAlignment: Text.AlignHCenter; Layout.preferredWidth: 50; wrapMode: Text.WordWrap; elide: Text.ElideNone; }
166+
Text { text: qsTr("High"); horizontalAlignment: Text.AlignHCenter; Layout.preferredWidth: 50; wrapMode: Text.WordWrap; elide: Text.ElideNone; }
167+
}
159168

160169
rowComponent: RowLayout
161170
{
@@ -482,10 +491,27 @@ Form
482491
id: responsesResponseOptimizer
483492
allowedColumns: ["scale"]
484493
label: qsTr("Included responses")
485-
width: 450
486-
rowComponentTitle: "Goal Lower Target Upper Weight Importance"
487-
rowComponent: Row
494+
width: 450 * preferencesModel.uiScale
495+
496+
property int rowWidth: Math.round(width / 12)
497+
498+
RowLayout
499+
{
500+
id: responseHeader
501+
anchors.right: parent.right
502+
spacing: 6
503+
504+
Text { text: qsTr("Goal"); Layout.preferredWidth: responsesResponseOptimizer.rowWidth; wrapMode: Text.WordWrap; elide: Text.ElideNone; }
505+
Text { text: qsTr("Lower"); Layout.preferredWidth: responsesResponseOptimizer.rowWidth; wrapMode: Text.WordWrap; elide: Text.ElideNone; }
506+
Text { text: qsTr("Target"); Layout.preferredWidth: responsesResponseOptimizer.rowWidth; wrapMode: Text.WordWrap; elide: Text.ElideNone; }
507+
Text { text: qsTr("Upper"); Layout.preferredWidth: responsesResponseOptimizer.rowWidth; wrapMode: Text.WordWrap; elide: Text.ElideNone; }
508+
Text { text: qsTr("Weight"); Layout.preferredWidth: responsesResponseOptimizer.rowWidth; wrapMode: Text.WordWrap; elide: Text.ElideNone; }
509+
Text { text: qsTr("Importance"); Layout.preferredWidth: 2 * responsesResponseOptimizer.rowWidth; wrapMode: Text.WordWrap; elide: Text.ElideNone; }
510+
}
511+
512+
rowComponent: Row
488513
{
514+
spacing: 6
489515
DropDown
490516
{
491517
name: "responseOptimizerGoal"
@@ -501,21 +527,21 @@ Form
501527
{
502528
name: "responseOptimizerLowerBound"
503529
defaultValue: 0
504-
fieldWidth: 40
530+
fieldWidth: 1.2 * responsesResponseOptimizer.rowWidth
505531
enabled: responseOptimizerGoal.currentValue != "minimize" & responseOptimizerManualBounds.checked
506532
}
507533
DoubleField
508534
{
509535
name: "responseOptimizerTarget"
510536
defaultValue: 0.5
511-
fieldWidth: 45
537+
fieldWidth: responsesResponseOptimizer.rowWidth
512538
enabled: responseOptimizerManualTarget.checked | responseOptimizerGoal.currentValue == "target"
513539
}
514540
DoubleField
515541
{
516542
name: "responseOptimizerUpperBound"
517543
defaultValue: 1
518-
fieldWidth: 40
544+
fieldWidth: responsesResponseOptimizer.rowWidth
519545
enabled: responseOptimizerGoal.currentValue != "maximize" & responseOptimizerManualBounds.checked
520546
}
521547
DoubleField
@@ -524,15 +550,15 @@ Form
524550
defaultValue: 1
525551
min: 0.1
526552
max: 10
527-
fieldWidth: 50
553+
fieldWidth: responsesResponseOptimizer.rowWidth
528554
}
529555
DoubleField
530556
{
531557
name: "responseOptimizerImportance"
532558
defaultValue: 1
533559
min: 0.1
534560
max: 10
535-
fieldWidth: 55
561+
fieldWidth: 1.7 * responsesResponseOptimizer.rowWidth
536562
enabled: responsesResponseOptimizer.count > 1
537563
}
538564
}

0 commit comments

Comments
 (0)