fixed a segfault after font editing when the edited glyph is located …

…on a sheet and a sheet is resized.
aizenbit · Nov 19, 2016 · 019cd07 · 019cd07
1 parent f1df3ee
commit 019cd07
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -74,7 +74,7 @@ MainWindow::MainWindow(QWidget *parent) :
             this, SLOT(renderNextSheet()));
 
     connect(fontDialog, SIGNAL(fontReady()),
-            ui->svgView, SLOT(loadFont()));
+            this, SLOT(updateCurrentSheet()));
     errorMessage->setModal(true);
 
     ui->toolBar->actions()[ToolButton::Render]->setShortcut(Qt::ControlModifier + Qt::Key_R);
@@ -278,6 +278,13 @@ void MainWindow::renderPreviousSheet()
     showSheetNumber(currentSheetNumber);
 }
 
+void MainWindow::updateCurrentSheet()
+{
+    ui->svgView->loadFont();
+    int lettersToTheEnd = text.length() - sheetPointers.at(currentSheetNumber);
+    ui->svgView->renderText(QStringRef(&text, sheetPointers.at(currentSheetNumber), lettersToTheEnd));
+}
+
 void MainWindow::loadFont()
 {
     QString fileName = QFileDialog::getOpenFileName(0, tr("Open"), "",

diff --git a/mainwindow.h b/mainwindow.h
@@ -78,6 +78,7 @@ private slots:
     void renderFirstSheet();
     void renderNextSheet();
     void renderPreviousSheet();
+    void updateCurrentSheet();
     void loadFont();
     void saveSheet(QString fileName = QString());
     void saveAllSheets();