diff --git a/NEWS.md b/NEWS.md index 9eafb18c..3fd2c6c6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,6 +10,7 @@ Red Panda C++ Version 1.1.6 - fix: inefficient loop when render long lines - fix: indents for "default" are not the same with "case" - fix: (wrongly) use the default font to calculate non-ascii characters' width + - change: switch positions of problem case output and expected output Red Panda C++ Version 1.1.5 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 42476982..29fc7c7f 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -6363,13 +6363,14 @@ void MainWindow::setDockMessagesToArea(const Qt::DockWidgetArea &area) layout->addWidget(ui->txtProblemCaseInput, 1, 0, 1, 1); // layout->addWidget(ui->lblProblemCaseInput, 2, 0, 1, 1); - layout->addWidget(ui->widgetProblemCaseExpectedCaption, 0, 1, 1, 1); - layout->addWidget(ui->txtProblemCaseExpected, 1, 1, 1, 1); -// layout->addWidget(ui->lblProblemCaseExpected, 2, 1, 1, 1); + layout->addWidget(ui->widgetProblemCaseOutputCaption, 0, 1, 1, 1); + layout->addWidget(ui->txtProblemCaseOutput, 1, 1, 1, 1); +// layout->addWidget(ui->lblProblemCaseOutput, 2, 1, 1, 1); + + layout->addWidget(ui->widgetProblemCaseExpectedCaption, 0, 2, 1, 1); + layout->addWidget(ui->txtProblemCaseExpected, 1, 2, 1, 1); +// layout->addWidget(ui->lblProblemCaseExpected, 2, 2, 1, 1); - layout->addWidget(ui->widgetProblemCaseOutputCaption, 0, 2, 1, 1); - layout->addWidget(ui->txtProblemCaseOutput, 1, 2, 1, 1); -// layout->addWidget(ui->lblProblemCaseOutput, 2, 2, 1, 1); break; @@ -6378,13 +6379,14 @@ void MainWindow::setDockMessagesToArea(const Qt::DockWidgetArea &area) layout->addWidget(ui->txtProblemCaseInput, 1, 0, 1, 1); //layout->addWidget(ui->lblProblemCaseInput, 2, 0, 1, 1); - layout->addWidget(ui->widgetProblemCaseExpectedCaption, 3, 0, 1, 1); - layout->addWidget(ui->txtProblemCaseExpected, 4, 0, 1, 1); - //layout->addWidget(ui->lblProblemCaseExpected, 5, 0, 1, 1); - layout->addWidget(ui->widgetProblemCaseOutputCaption, 6, 0, 1, 1); - layout->addWidget(ui->txtProblemCaseOutput, 7, 0, 1, 1); - //layout->addWidget(ui->lblProblemCaseOutput, 8, 0, 1, 1); + layout->addWidget(ui->widgetProblemCaseOutputCaption, 3, 0, 1, 1); + layout->addWidget(ui->txtProblemCaseOutput, 4, 0, 1, 1); + //layout->addWidget(ui->lblProblemCaseOutput, 5, 0, 1, 1); + + layout->addWidget(ui->widgetProblemCaseExpectedCaption, 6, 0, 1, 1); + layout->addWidget(ui->txtProblemCaseExpected, 7, 0, 1, 1); + //layout->addWidget(ui->lblProblemCaseExpected, 8, 0, 1, 1); } } diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index a271cda2..d7bf4618 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -871,7 +871,7 @@ QTabWidget::South - 1 + 6 @@ -1737,56 +1737,6 @@ 0 - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - - - - QPlainTextEdit::NoWrap - - - true - - - - - - - - 0 - 0 - - - - QPlainTextEdit::NoWrap - - - @@ -1847,7 +1797,56 @@ - + + + + + + + + + + + + 0 + 0 + + + + QPlainTextEdit::NoWrap + + + + + + + + 0 + 0 + + + + QPlainTextEdit::NoWrap + + + + + + + + 0 + 0 + + + + QPlainTextEdit::NoWrap + + + true + + + + @@ -1907,20 +1906,7 @@ - - - - - 0 - 0 - - - - QPlainTextEdit::NoWrap - - - - + @@ -1965,6 +1951,20 @@ + + + + + + + + + + + + + +