diff --git a/NEWS.md b/NEWS.md index a0569d15..6b90d7f0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -11,6 +11,7 @@ Red Panda C++ Version 2.8 - enhancement: "Toggle readonly" in the Edit menu. - fix: Error When save project units' encoding settings. - enhancement: Waiting for syntax parsers to finish before saving files, to prevent data lost caused by syntax parsering crash. + - fix: Restore main window and cpu info window will set wrong font in the cpu info. Red Panda C++ Version 2.7 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index f94b1d58..c098916a 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -851,6 +851,8 @@ void MainWindow::applySettings() qApp->setFont(font); this->setFont(font); for (QWidget* p:findChildren()) { + if (mCPUDialog && (p==mCPUDialog || mCPUDialog->isAncestorOf(p))) + continue; p->setFont(font); } if (pSettings->environment().useCustomIconSet()) { @@ -1853,11 +1855,6 @@ void MainWindow::checkSyntaxInBack(Editor *e) } } -bool MainWindow::compiling() -{ - return (mCompilerManager->backgroundSyntaxChecking()) || (mCompilerManager->compiling()); -} - bool MainWindow::parsing() { if (mProject && mProject->cppParser() && mProject->cppParser()->parsing()) diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index ee5092dc..a4827224 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -131,7 +131,6 @@ public: void updateDebuggerSettings(); void updateActionIcons(); void checkSyntaxInBack(Editor* e); - bool compiling(); bool parsing(); bool compile(bool rebuild=false, CppCompileType compileType=CppCompileType::Normal); void runExecutable(