Merge pull request #939 from deXol/develop

[BLE] Tutorial UI changes
mooltipass · Dec 1, 2021 · 9ef7afd · 9ef7afd
2 parents feeeacf + 0e03029
commit 9ef7afd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/TutorialWidget.cpp b/src/TutorialWidget.cpp
@@ -29,6 +29,7 @@ TutorialWidget::TutorialWidget(QWidget *parent) :
     tutorialTextLayout->addWidget(m_titleLabel);
     tutorialTextLayout->addWidget(m_messageLabel);
     tutorialTextLayout->setSpacing(TUTORIAL_TEXT_SPACING);
+    tutorialTextLayout->setContentsMargins(-1, -1, -1, TUTORIAL_BOTTOM_MARGIN);
     tutorialTextLayout->addStretch();
     m_messageLabel->setWordWrap(true);
 
@@ -38,7 +39,7 @@ TutorialWidget::TutorialWidget(QWidget *parent) :
     lay->addWidget(m_exitButton);
     lay->addStretch();
 
-    setStyleSheet("TutorialWidget {border: 15px solid #60B1C7; border-color: red;} ");
+    setStyleSheet("TutorialWidget {border: solid; border-width: 5px 0 5px 0; border-color: red;} ");
 
     m_nextButton->setText(tr("Next"));
     m_nextButton->setStyleSheet(CSS_BLUE_BUTTON);

diff --git a/src/TutorialWidget.h b/src/TutorialWidget.h
@@ -65,9 +65,10 @@ public slots:
     static const QString TUTORIAL_HEADER_TEXT;
     static const QString TUTORIAL_FINISHED_SETTING;
     static constexpr int TUTORIAL_MAX_HEIGHT = 200;
-    static constexpr int TUTORIAL_LABEL_WIDTH = 700;
+    static constexpr int TUTORIAL_LABEL_WIDTH = 800;
     static constexpr int TUTORIAL_TEXT_SPACING = 12;
-    static constexpr int TUTORIAL_FONT_SIZE = 12;
+    static constexpr int TUTORIAL_BOTTOM_MARGIN = 6;
+    static constexpr int TUTORIAL_FONT_SIZE = 11;
 };
 
 #endif // TUTORIALWIDGET_H