Change the minimum width for modals

4 files changed, 5 insertions, 8 deletions

diff --git a/src/dialogs/CreateRoom.cpp b/src/dialogs/CreateRoom.cpp

index 078a3038..06676d3d 100644
--- a/src/dialogs/CreateRoom.cpp
+++ b/src/dialogs/CreateRoom.cpp
@@ -24,8 +24,7 @@ CreateRoom::CreateRoom(QWidget *parent)
 
         setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
         setMinimumHeight(conf::modals::MIN_WIDGET_HEIGHT);
-        setMinimumWidth(QFontMetrics(largeFont).averageCharWidth() * 30 -
-                        2 * conf::modals::WIDGET_MARGIN);
+        setMinimumWidth(conf::window::minModalWidth);
 
         auto layout = new QVBoxLayout(this);
         layout->setSpacing(conf::modals::WIDGET_SPACING);
diff --git a/src/dialogs/InviteUsers.cpp b/src/dialogs/InviteUsers.cpp

index ab523a56..bacfe498 100644
--- a/src/dialogs/InviteUsers.cpp
+++ b/src/dialogs/InviteUsers.cpp
@@ -25,7 +25,7 @@ InviteUsers::InviteUsers(QWidget *parent)
         setWindowModality(Qt::WindowModal);
         setAttribute(Qt::WA_DeleteOnClose, true);
 
-        setMinimumWidth(conf::modals::MIN_WIDGET_WIDTH);
+        setMinimumWidth(conf::window::minModalWidth);
         setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
 
         auto layout = new QVBoxLayout(this);
diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp

index c192bd3d..f9b7e913 100644
--- a/src/dialogs/RoomSettings.cpp
+++ b/src/dialogs/RoomSettings.cpp
@@ -50,7 +50,7 @@ EditModal::EditModal(const QString &roomId, QWidget *parent)
 
         QFont largeFont;
         largeFont.setPointSizeF(largeFont.pointSizeF() * 1.4);
-        setMinimumWidth(QFontMetrics(largeFont).averageCharWidth() * 30 - 2 * WIDGET_MARGIN);
+        setMinimumWidth(conf::window::minModalWidth);
         setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
 
         auto layout = new QVBoxLayout(this);
@@ -172,7 +172,7 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
         QFont largeFont;
         largeFont.setPointSizeF(largeFont.pointSizeF() * 1.5);
 
-        setMinimumWidth(QFontMetrics(largeFont).averageCharWidth() * 30 - 2 * WIDGET_MARGIN);
+        setMinimumWidth(conf::window::minModalWidth);
         setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
 
         auto layout = new QVBoxLayout(this);
@@ -181,7 +181,6 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
 
         QFont font;
         font.setWeight(QFont::Medium);
-        font.setPointSizeF(font.pointSizeF() * 1.2);
         auto settingsLabel = new QLabel(tr("Settings").toUpper(), this);
         settingsLabel->setFont(font);
 
diff --git a/src/dialogs/UserProfile.cpp b/src/dialogs/UserProfile.cpp

index 27182711..b8040f9f 100644
--- a/src/dialogs/UserProfile.cpp
+++ b/src/dialogs/UserProfile.cpp
@@ -175,8 +175,7 @@ UserProfile::UserProfile(QWidget *parent)
         largeFont.setPointSizeF(largeFont.pointSizeF() * 1.5);
 
         setMinimumWidth(
-          std::max(devices_->sizeHint().width() + 4 * WIDGET_MARGIN,
-                   QFontMetrics(largeFont).averageCharWidth() * 30 - 2 * WIDGET_MARGIN));
+          std::max(devices_->sizeHint().width() + 4 * WIDGET_MARGIN, conf::window::minModalWidth));
         setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
 
         vlayout->setSpacing(WIDGET_SPACING);