From 38bc0671257141198f1e7b6d64f970c552fc448d Mon Sep 17 00:00:00 2001
From: jo-hannes <jo-hannes@dev-urandom.de>
Date: Sun, 17 Nov 2024 15:15:28 +0100
Subject: [PATCH] MixResultWidget: Improve style selection

---
 src/mixture/mixresultwidget.cpp | 20 ++++++++++++--------
 translations/Aqua-mixtura_de.ts |  5 ++---
 translations/Aqua-mixtura_en.ts |  5 ++---
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/mixture/mixresultwidget.cpp b/src/mixture/mixresultwidget.cpp
index 8f85b24..65496cc 100644
--- a/src/mixture/mixresultwidget.cpp
+++ b/src/mixture/mixresultwidget.cpp
@@ -17,29 +17,33 @@ MixResultWidget::MixResultWidget(Mixture& mixture, Styles& styleDb, Settings& se
   QGridLayout* layout = new QGridLayout();
   this->setLayout(layout);
 
-  layout->addWidget(new QLabel(tr("Ergebnis")), 0, 0, Qt::AlignLeft);
-  layout->addWidget(new QLabel(tr("Bierstil") + ":"), 0, 1, 1, 2, Qt::AlignLeft);
+  int row = 0;
+  layout->addWidget(new QLabel(tr("Ergebnis")), row, 0, Qt::AlignLeft);
 
   styleSelect = new QComboBox();
-  styleSelect->setMaximumWidth(122);  // TODO Replace magic number here. Need to be same as ResultBar::width
-  layout->addWidget(styleSelect, 0, 3, Qt::AlignLeft);
+  styleSelect->setMinimumContentsLength(30);
+  styleSelect->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
+
+  layout->addWidget(styleSelect, ++row, 0, 1, 4, Qt::AlignLeft);
   QObject::connect(styleSelect, &QComboBox::activated, this, &MixResultWidget::selectStyle);
 
   // values
   for (int i = 0; i < static_cast<int>(Water::Value::Size); i++) {
+    ++row;
     // Description
-    layout->addWidget(new QLabel(Water::translatableStrings[i]), i + 1, 0);
+    layout->addWidget(new QLabel(Water::translatableStrings[i]), row, 0);
     // value
     vals[i] = new QLabel();
-    layout->addWidget(vals[i], i + 1, 1);
+    layout->addWidget(vals[i], row, 1, Qt::AlignRight);
     // Unit
-    layout->addWidget(new QLabel(Water::waterStrings[i][static_cast<int>(Water::Idx::Unit)]), i + 1, 2);
+    layout->addWidget(new QLabel(Water::waterStrings[i][static_cast<int>(Water::Idx::Unit)]), row, 2, Qt::AlignLeft);
     // Bars
     if (i != static_cast<int>(Water::Value::Volume)) {
       bars[i] = new ResultBar();
-      layout->addWidget(bars[i], i + 1, 3);
+      layout->addWidget(bars[i], row, 3);
     }
   }
+  layout->setRowStretch(++row, 99);
 
   styleIdx = 0;  // Select style of mixture
   updateStyles();
diff --git a/translations/Aqua-mixtura_de.ts b/translations/Aqua-mixtura_de.ts
index ed0269c..17330f2 100644
--- a/translations/Aqua-mixtura_de.ts
+++ b/translations/Aqua-mixtura_de.ts
@@ -423,14 +423,13 @@
 <context>
     <name>MixResultWidget</name>
     <message>
-        <location filename="../src/mixture/mixresultwidget.cpp" line="20"/>
+        <location filename="../src/mixture/mixresultwidget.cpp" line="21"/>
         <source>Ergebnis</source>
         <translation>Ergebnis</translation>
     </message>
     <message>
-        <location filename="../src/mixture/mixresultwidget.cpp" line="21"/>
         <source>Bierstil</source>
-        <translation>Bierstil</translation>
+        <translation type="vanished">Bierstil</translation>
     </message>
 </context>
 <context>
diff --git a/translations/Aqua-mixtura_en.ts b/translations/Aqua-mixtura_en.ts
index 04ce855..a255955 100644
--- a/translations/Aqua-mixtura_en.ts
+++ b/translations/Aqua-mixtura_en.ts
@@ -416,14 +416,13 @@
 <context>
     <name>MixResultWidget</name>
     <message>
-        <location filename="../src/mixture/mixresultwidget.cpp" line="20"/>
+        <location filename="../src/mixture/mixresultwidget.cpp" line="21"/>
         <source>Ergebnis</source>
         <translation>Result</translation>
     </message>
     <message>
-        <location filename="../src/mixture/mixresultwidget.cpp" line="21"/>
         <source>Bierstil</source>
-        <translation>Beer style</translation>
+        <translation type="vanished">Beer style</translation>
     </message>
 </context>
 <context>