resolving merge conflicts

2021-01-08 09:58:52 -06:00
parent c84b6df7d3 b1ba67ac4d
commit 73fe772b70
90 changed files with 7190 additions and 3036 deletions
--- a/src/config/configwindow.cpp
+++ b/src/config/configwindow.cpp
@@ -36,8 +36,8 @@ ConfigWindow::ConfigWindow(QWidget* parent)
  : QTabWidget(parent)
 {
    setAttribute(Qt::WA_DeleteOnClose);
-    const int size = GlobalValues::buttonBaseSize() * 12;
-    setMinimumSize(size, size);
+    setMinimumSize(GlobalValues::buttonBaseSize() * 15,
+                   GlobalValues::buttonBaseSize() * 12);
    setWindowIcon(QIcon(":img/app/flameshot.svg"));
    setWindowTitle(tr("Configuration"));