Merge branch 'master' of https://github.com/NautiluX/slide into NautiluX-master

This commit is contained in:
Alfred Reynolds
2021-09-08 11:05:10 +12:00
3 changed files with 37 additions and 6 deletions

View File

@@ -281,7 +281,7 @@ void MainWindow::updateImage(bool immediately)
void MainWindow::drawText(QPixmap& image, int margin, int fontsize, QString text, int alignment) {
QPainter pt(&image);
pt.setPen(QPen(Qt::white));
pt.setPen(QPen(QColor(overlayHexRGB)));
pt.setFont(QFont("Sans", fontsize, QFont::Bold));
QRect marginRect = image.rect().adjusted(
margin,
@@ -396,6 +396,11 @@ void MainWindow::setBackgroundOpacity(unsigned int backgroundOpacity)
this->backgroundOpacity = backgroundOpacity;
}
void MainWindow::setOverlayHexRGB(QString overlayHexRGB)
{
this->overlayHexRGB = overlayHexRGB;
}
void MainWindow::warn(std::string text)
{
QLabel *label = this->findChild<QLabel*>("image");