Merged in ValentinaZhuravska/valentina/feature (pull request #79)

Correct save of currentDrawIndex

--HG--
branch : develop
This commit is contained in:
Roman Telezhinskyi 2015-11-25 11:58:22 +02:00
commit 88a61513ee

View File

@ -1822,8 +1822,11 @@ void MainWindow::ActionDetails(bool checked)
disconnect(ui->view, &VMainGraphicsView::NewFactor, sceneDraw, &VMainGraphicsScene::SetFactor);
RestoreCurrentScene();
drawMode = false;
currentDrawIndex = comboBoxDraws->currentIndex();//save current pattern peace
if(drawMode)
{
currentDrawIndex = comboBoxDraws->currentIndex();//save current pattern peace
drawMode = false;
}
comboBoxDraws->setCurrentIndex(comboBoxDraws->count()-1);
comboBoxDraws->setEnabled(false);
@ -1905,8 +1908,11 @@ void MainWindow::ActionLayout(bool checked)
ui->view->setScene(currentScene);
disconnect(ui->view, &VMainGraphicsView::NewFactor, sceneDraw, &VMainGraphicsScene::SetFactor);
drawMode = false;
currentDrawIndex = comboBoxDraws->currentIndex();//save current pattern peace
if(drawMode)
{
currentDrawIndex = comboBoxDraws->currentIndex();//save current pattern peace
drawMode = false;
}
comboBoxDraws->setCurrentIndex(-1);
comboBoxDraws->setEnabled(false);