From 42594804711fc90f42f5d989b980ac7e551b7fc9 Mon Sep 17 00:00:00 2001 From: "royqh1979@gmail.com" Date: Mon, 8 Nov 2021 21:19:48 +0800 Subject: [PATCH] - fix: correct set the position of chinese input methods --- NEWS.md | 3 +- RedPandaIDE/RedPandaIDE.pro | 3 + RedPandaIDE/RedPandaIDE_zh_CN.qm | Bin 104124 -> 104468 bytes RedPandaIDE/RedPandaIDE_zh_CN.ts | 594 +++++++++--------- RedPandaIDE/editor.cpp | 49 +- RedPandaIDE/editor.h | 4 + RedPandaIDE/mainwindow.cpp | 36 +- RedPandaIDE/mainwindow.h | 5 + RedPandaIDE/qsynedit/SynEdit.cpp | 33 +- RedPandaIDE/qsynedit/SynEdit.h | 7 +- RedPandaIDE/settings.cpp | 2 +- .../editorcodecompletionwidget.cpp | 2 - .../environmentperformancewidget.cpp | 27 + .../environmentperformancewidget.h | 26 + .../environmentperformancewidget.ui | 50 ++ RedPandaIDE/settingsdialog/settingsdialog.cpp | 5 + 16 files changed, 516 insertions(+), 330 deletions(-) create mode 100644 RedPandaIDE/settingsdialog/environmentperformancewidget.cpp create mode 100644 RedPandaIDE/settingsdialog/environmentperformancewidget.h create mode 100644 RedPandaIDE/settingsdialog/environmentperformancewidget.ui diff --git a/NEWS.md b/NEWS.md index 1de5bc01..799d43e1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,8 @@ Version 0.8.2 For Dev-C++ 7 Beta - fix: highlighter can't correctly find the end of ANSI C-style Comments - enhancement: add default color scheme to themes. Change theme option will change color scheme too. - fix: when changing options in the option dialog's color scheme panle, color of the demo editor won't be not correctly updated - - enhancement: auto clear parsed symbols when the editor is hidden ( to reduce memory usage of un-active editors) + - enhancement: add option to auto clear parsed symbols when the editor is hidden ( to reduce total memory usage / turned off by default) + - fix: correct set the position of chinese input methods Version 0.8.1 For Dev-C++ 7 Beta - fix: ConsolePaurser.exe only exits when press ENTER diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index 6008b824..c3592332 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -55,6 +55,7 @@ SOURCES += \ settingsdialog/editortooltipswidget.cpp \ settingsdialog/environmentfileassociationwidget.cpp \ settingsdialog/environmentfolderswidget.cpp \ + settingsdialog/environmentperformancewidget.cpp \ settingsdialog/environmentshortcutwidget.cpp \ settingsdialog/executorproblemsetwidget.cpp \ settingsdialog/formattergeneralwidget.cpp \ @@ -176,6 +177,7 @@ HEADERS += \ settingsdialog/editortooltipswidget.h \ settingsdialog/environmentfileassociationwidget.h \ settingsdialog/environmentfolderswidget.h \ + settingsdialog/environmentperformancewidget.h \ settingsdialog/environmentshortcutwidget.h \ settingsdialog/executorproblemsetwidget.h \ settingsdialog/formattergeneralwidget.h \ @@ -267,6 +269,7 @@ FORMS += \ settingsdialog/editortooltipswidget.ui \ settingsdialog/environmentfileassociationwidget.ui \ settingsdialog/environmentfolderswidget.ui \ + settingsdialog/environmentperformancewidget.ui \ settingsdialog/environmentshortcutwidget.ui \ settingsdialog/executorproblemsetwidget.ui \ settingsdialog/formattergeneralwidget.ui \ diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index e07975b98710e31b547a72191c0f160bf5843413..0c2b609f31c54195b39ba8dac47cdc15c345eb9d 100644 GIT binary patch delta 9093 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 I$dau82U17|RsaA1 delta 8917 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 r!p#ZY&tY}Yw;j{{357j`CZTwkbn~dx 要剪切的内容超过了字符数限制！ - + Print Document 打印文档 - - - + + + Ctrl+click for more info Ctrl+单击以获取更多信息 - - + + Symbol '%1' not found! 未找到符号'%1'! - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -1856,6 +1856,24 @@ Are you really want to continue? 删除自定义设置失败 + + EnvironmentPerformanceWidget + + + Form + 表单 + + + + Reduce Memory Usage + 减少内存用量 + + + + Auto clear parsed symbols when editor hidden + 自动清理被隐藏的编辑器中的符号表 + + EnvironmentShortcutModel @@ -2838,11 +2856,11 @@ Are you really want to continue? - - - - - + + + + + Issues 编译器 @@ -2986,7 +3004,7 @@ Are you really want to continue? 工具栏2 - + New 新建 @@ -3044,10 +3062,10 @@ Are you really want to continue? - - - - + + + + Compile 编译 @@ -3093,8 +3111,8 @@ Are you really want to continue? - - + + Copy 复制 @@ -3105,7 +3123,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -3116,7 +3134,7 @@ Are you really want to continue? - + Select All 选择全部 @@ -3235,14 +3253,14 @@ Are you really want to continue? - + Problem Set 试题集 - + New Problem Set 新建试题集 @@ -3261,14 +3279,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -3301,7 +3319,7 @@ Are you really want to continue? - + Problem 试题 @@ -3590,7 +3608,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -3691,7 +3709,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -3712,13 +3730,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -3774,7 +3792,7 @@ Are you really want to continue? - + Open Folder 打开文件夹 @@ -3784,42 +3802,42 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -3828,184 +3846,184 @@ Are you really want to continue? 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 - + Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 - + Close project 关闭项目 - + Are you sure you want to close %1? 你确定要关闭'%1'吗？ - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - - + + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - - + + Enable debugging 启用调试参数 - - + + You have not enabled debugging info (-g3) and/or stripped it from the executable (-s) in Compiler Options.<BR /><BR />Do you want to correct this now? 当前编译设置中未启用调试选项(-g3)，或启用了信息剥除选项(-s)<br /><br/>是否纠正这一问题？ - + Project not built 项目尚未构建 - + Project hasn't been built. Build it now? 项目尚未构建。是否构建？ - + Host applcation missing 宿主程序不存在 - + DLL project needs a host application to run. 动态链接库（DLL）需要一个宿主程序来运行。 - + But it's missing. 但它不存在。 - + Host application not exists 宿主程序不存在 - + Host application file '%1' doesn't exist. 宿主程序'%1'不存在。 - + Recompile? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 - + Can't remove old last open information file '%1' 无法删除旧上次打开信息文件'%1' - + Can't save last open info file '%1' 无法保存上次打开信息文件'%1' - + Load last open info error 载入上次打开信息失败 - + Can't load last open info file '%1' 无法载入上次打开信息文件'%1' - + Copy all 全部复制 - - + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -4026,488 +4044,488 @@ Are you really want to continue? 或者选择使用其他的网络端口。 - + Red Panda Dev-C++ 小熊猫Dev-C++ - + Properties... 试题属性... - + Set Problem Set Name 设置试题集名称 - + Problem Set Name: 试题集名称： - + Remove 删除 - + Remove All Bookmarks 删除全部书签 - + Modify Description 修改描述 - - - + + + Bookmark Description 书签描述 - - - + + + Description: 描述： - + Show debug logs in the debug console 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 - + Remove Folder 删除文件夹 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在Windows浏览器中打开 - + Character sets 字符集 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 - + C/C++Source Files (*.c *.cpp *.cc *.cxx) C/C++Source Files (*.c *.cpp *.cc *.cxx C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - - + + Do you want to save it? 需要保存吗？ - - - - + + + + Save Error 保存失败 - + Change Project Compiler Set 改变项目编译器配置集 - + Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - + Do you really want to do that? 你真的想要做那些吗？ - + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Red panda Dev-C++ project file (*.dev) 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + untitled 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 - + Rename Error 重命名出错 - + Symbol '%1' is defined in system header. 符号'%1'在系统头文件中定义，无法修改。 - + New Name 新名称 - - + + Replace Error 替换出错 - + Can't open file '%1' for replace! 无法打开文件'%1'进行替换！ - + Contents has changed since last search! 内容和上次查找时不一致。 - + Rich Text Format Files (*.rtf) RTF格式文件 (*.rtf) - + HTML Files (*.html) HTML文件 (*.html) - + The current problem set is not empty. 当前的试题集不是空的。 - + Problem %1 试题%1 - + Problem Set Files (*.pbs) 试题集文件 (*.pbs) - + Load Error 载入失败 - - + + Problem Case %1 试题案例%1 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error 错误 - + Recent Projects 项目历史 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - + Compile Failed 编译失败 - + Run Failed 运行失败 - - + + Confirm Convertion 确认转换 - - + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -6371,214 +6389,220 @@ Are you really want to continue? 取消 - + Appearence 外观 - - - - + + + + + Environment 环境 - + File Association 文件关联 - + Shortcuts 快捷键 - + Folders 文件夹 - - + + Performance + 性能 + + + + Compiler Set 编译器配置集 - - + + Compiler 编译器 - + Auto Link 自动链接 - - - - - - - + + + + + + + General 通用 - - - - - - - - - - - + + + + + + + + + + + Editor 编辑器 - + Font 字体 - + Copy & Export 复制/导出 - + Color 配色 - + Code Completion 代码补全 - + Symbol Completion 符号补全 - + Snippet 代码模板 - + Auto Syntax Checking 自动语法检查 - + Tooltips 信息提示 - + Auto save 自动保存 - + Misc 杂项 - - - + + + Program Runner 程序运行 - + Problem Set 试题集 - + Debugger 调试器 - + Code Formatter 代码排版 - + Tools 工具 - - - - - - - - - - + + + + + + + + + + Project 项目 - + Files 文件 - + Custom Compile options 自定义编译选项 - + Directories 文件夹 - + Precompiled Header 预编译头文件 - + Makefile Makefile - + Output 输出 - + DLL host DLL宿主 - + Version info 版本信息 - + Save Changes 保存修改 - + There are changes in the settings, do you want to save them before swtich to other page? 本页中有尚未保存的设置修改，是否保存后再切换到其他页？ diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 97f48216..794aa1fb 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -1375,7 +1375,11 @@ void Editor::onStatusChanged(SynStatusChanges changes) && !changes.testFlag(SynStatusChange::scReadOnly) && changes.testFlag(SynStatusChange::scCaretY))) { mCurrentLineModified = false; - reparse(); + if (pSettings->codeCompletion().clearWhenEditorHidden() + && changes.testFlag(SynStatusChange::scOpenFile)) { + } else{ + reparse(); + } if (pSettings->editor().syntaxCheckWhenLineChanged()) checkSyntaxInBack(); reparseTodo(); @@ -1458,28 +1462,7 @@ void Editor::onStatusChanged(SynStatusChanges changes) } else { mCurrentHighlightedWord = ""; } -// mSelectionWord=""; -// if (selAvail()) { -// BufferCoord wordBegin,wordEnd,bb,be; -// bb = blockBegin(); -// be = blockEnd(); -// wordBegin = wordStartEx(bb); -// wordEnd = wordEndEx(be); -// if (wordBegin.Line == bb.Line -// && wordBegin.Char == bb.Char -// && wordEnd.Line == be.Line -// && wordEnd.Char == be.Char) { -// if (wordBegin.Line>=1 && wordBegin.Line<=lines()->count()) { -// QString line = lines()->getString(wordBegin.Line-1); -// mSelectionWord = line.mid(wordBegin.Char-1,wordEnd.Char-wordBegin.Char); -// } -// } -//// qDebug()<editor().showFunctionTips()) { updateFunctionTip(); } -// fFunctionTip.ForceHide := false; -// if Assigned(fFunctionTipTimer) then begin -// if fFunctionTip.Activated and FunctionTipAllowed then begin -// fFunctionTip.Parser := fParser; -// fFunctionTip.FileName := fFileName; -// fFunctionTip.Show; -// end else begin // Reset the timer -// fFunctionTipTimer.Enabled := false; -// fFunctionTipTimer.Enabled := true; -// end; } @@ -3148,6 +3121,16 @@ void Editor::onExportedFormatToken(PSynHighlighter syntaxHighlighter, int Line, } } +const QDateTime &Editor::hideTime() const +{ + return mHideTime; +} + +void Editor::setHideTime(const QDateTime &newHideTime) +{ + mHideTime = newHideTime; +} + const std::shared_ptr > > &Editor::statementColors() const { return mStatementColors; diff --git a/RedPandaIDE/editor.h b/RedPandaIDE/editor.h index 9380cc6f..52b07f33 100644 --- a/RedPandaIDE/editor.h +++ b/RedPandaIDE/editor.h @@ -261,6 +261,7 @@ private: TipType mCurrentTipType; QString mOldHighlightedWord; QString mCurrentHighlightedWord; + QDateTime mHideTime; bool mSaving; bool mCurrentLineModified; @@ -308,6 +309,9 @@ public: const std::shared_ptr > > &statementColors() const; void setStatementColors(const std::shared_ptr > > &newStatementColors); + const QDateTime &hideTime() const; + void setHideTime(const QDateTime &newHideTime); + protected: void mouseReleaseEvent(QMouseEvent *event) override; diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 7e77a612..e602df08 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -60,6 +60,7 @@ MainWindow::MainWindow(QWidget *parent) mOpenClosingLeftPanel(false), mShouldRemoveAllSettings(false), mClosing(false), + mOpenningFiles(false), mSystemTurnedOff(false) { ui->setupUi(this); @@ -727,7 +728,7 @@ void MainWindow::rebuildOpenedFileHisotryMenu() for (const QString& filename: pSettings->history().openedFiles()) { QAction* action = new QAction(filename,mMenuRecentFiles); connect(action, &QAction::triggered, [&filename,this](bool){ - this->openFile(filename); + openFile(filename); }); mMenuRecentFiles->addAction(action); } @@ -843,8 +844,12 @@ void MainWindow::updateStatusbarMessage(const QString &s) void MainWindow::openFiles(const QStringList &files) { mEditorList->beginUpdate(); + mOpenningFiles = true; auto end = finally([this] { this->mEditorList->endUpdate(); + mOpenningFiles = false; + updateEditorParser(ui->EditorTabsLeft); + updateEditorParser(ui->EditorTabsRight); }); //Check if there is a project file in the list and open it for (const QString& file:files) { @@ -4772,8 +4777,10 @@ PSymbolUsageManager &MainWindow::symbolUsageManager() return mSymbolUsageManager; } -static void updateEditorParser(QTabWidget* tabWidget, - Editor* editor) { +void MainWindow::updateEditorParser(QTabWidget* tabWidget) { + if (mOpenningFiles) + return; + Editor * editor = mEditorList->getEditor(-1,tabWidget); if (pSettings->codeCompletion().clearWhenEditorHidden()) { for (int i=0;icount();i++) { Editor * e = (Editor*)(tabWidget->widget(i)); @@ -4790,13 +4797,26 @@ static void updateEditorParser(QTabWidget* tabWidget, } } +void MainWindow::updateEditorHideTime(QTabWidget* tabWidget) { + Editor * editor = mEditorList->getEditor(-1,tabWidget); + for (int i=0;icount();i++) { + Editor * e = (Editor*)(tabWidget->widget(i)); + if (e!=editor) { + if (!e->hideTime().isValid()) + e->setHideTime(QDateTime::currentDateTime()); + } else { + e->setHideTime(QDateTime()); + } + } +} void MainWindow::on_EditorTabsLeft_currentChanged(int) { Editor * editor = mEditorList->getEditor(-1,ui->EditorTabsLeft); if (editor) { editor->reparseTodo(); } - updateEditorParser(ui->EditorTabsLeft,editor); + updateEditorParser(ui->EditorTabsLeft); + updateEditorHideTime(ui->EditorTabsLeft); } @@ -4806,7 +4826,8 @@ void MainWindow::on_EditorTabsRight_currentChanged(int) if (editor) { editor->reparseTodo(); } - updateEditorParser(ui->EditorTabsRight,editor); + updateEditorParser(ui->EditorTabsRight); + updateEditorHideTime(ui->EditorTabsRight); } @@ -5383,3 +5404,8 @@ void MainWindow::on_btnOpenProblemAnswer_clicked() } } +bool MainWindow::openningFiles() const +{ + return mOpenningFiles; +} + diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index db3b793a..f91c58a9 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -155,6 +155,8 @@ public: void openProject(const QString& filename); void changeOptions(const QString& widgetName=QString(), const QString& groupName=QString()); + bool openningFiles() const; + public slots: void onCompileLog(const QString& msg); void onCompileIssue(PCompileIssue issue); @@ -212,6 +214,8 @@ private: void doCompileRun(RunType runType); void updateProblemCaseOutput(POJProblemCase problemCase); void applyCurrentProblemCaseChanges(); + void updateEditorParser(QTabWidget* tabWidget); + void updateEditorHideTime(QTabWidget* tabWidget); private slots: void onAutoSaveTimeout(); @@ -534,6 +538,7 @@ private: CaretList mCaretList; bool mClosing; + bool mOpenningFiles; bool mSystemTurnedOff; QPoint mEditorContextMenuPos; QTcpServer mTcpServer; diff --git a/RedPandaIDE/qsynedit/SynEdit.cpp b/RedPandaIDE/qsynedit/SynEdit.cpp index 3481ac33..3497183a 100644 --- a/RedPandaIDE/qsynedit/SynEdit.cpp +++ b/RedPandaIDE/qsynedit/SynEdit.cpp @@ -2404,7 +2404,7 @@ bool SynEdit::canDoBlockIndent() return true; } -QRect SynEdit::calculateCaretRect() +QRect SynEdit::calculateCaretRect() const { DisplayCoord coord = displayXY(); if (!mInputPreeditString.isEmpty()) { @@ -2419,7 +2419,19 @@ QRect SynEdit::calculateCaretRect() caretWidth = charColumns(mLines->getString(mCaretY-1)[mCaretX-1])*mCharWidth; } return QRect(caretPos.x(),caretPos.y(),caretWidth, - mTextHeight); + mTextHeight); +} + +QRect SynEdit::calculateInputCaretRect() const +{ + DisplayCoord coord = displayXY(); + QPoint caretPos = rowColumnToPixels(coord); + int caretWidth=mCharWidth; + if (mCaretY <= mLines->count() && mCaretX <= mLines->getString(mCaretY-1).length()) { + caretWidth = charColumns(mLines->getString(mCaretY-1)[mCaretX-1])*mCharWidth; + } + return QRect(caretPos.x(),caretPos.y(),caretWidth, + mTextHeight); } void SynEdit::clearAreaList(SynEditingAreaList areaList) @@ -2946,6 +2958,10 @@ void SynEdit::setStatusChanged(SynStatusChanges changes) void SynEdit::doOnStatusChange(SynStatusChanges) { + if (mStatusChanges.testFlag(SynStatusChange::scCaretX) + || mStatusChanges.testFlag(SynStatusChange::scCaretY)) { + qApp->inputMethod()->update(Qt::ImCursorPosition); + } emit statusChanged(mStatusChanges); mStatusChanges = SynStatusChange::scNone; } @@ -6039,6 +6055,19 @@ bool SynEdit::viewportEvent(QEvent * event) return QAbstractScrollArea::viewportEvent(event); } +QVariant SynEdit::inputMethodQuery(Qt::InputMethodQuery property) const +{ + QRect rect = calculateInputCaretRect(); + + switch(property) { + case Qt::ImCursorRectangle: + return rect; + default: + return QWidget::inputMethodQuery(property); + } + +} + int SynEdit::maxScrollHeight() const { if (mOptions.testFlag(eoScrollPastEof)) diff --git a/RedPandaIDE/qsynedit/SynEdit.h b/RedPandaIDE/qsynedit/SynEdit.h index 634aac11..234c6637 100644 --- a/RedPandaIDE/qsynedit/SynEdit.h +++ b/RedPandaIDE/qsynedit/SynEdit.h @@ -524,7 +524,8 @@ private: BufferCoord getPreviousLeftBrace(int x,int y); bool canDoBlockIndent(); - QRect calculateCaretRect(); + QRect calculateCaretRect() const; + QRect calculateInputCaretRect() const; //Commands void doDeleteLastChar(); @@ -717,6 +718,10 @@ void wheelEvent(QWheelEvent *event) override; // QAbstractScrollArea interface protected: bool viewportEvent(QEvent * event) override; + +// QWidget interface +public: +QVariant inputMethodQuery(Qt::InputMethodQuery property) const override; }; #endif // SYNEDIT_H diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index bae75365..7b9cd538 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -3262,7 +3262,7 @@ void Settings::CodeCompletion::doLoad() mIgnoreCase = boolValue("ignore_case",true); mAppendFunc = boolValue("append_func",true); mShowCodeIns = boolValue("show_code_ins",true); - mClearWhenEditorHidden = boolValue("clear_when_editor_hidden",true); + mClearWhenEditorHidden = boolValue("clear_when_editor_hidden",false); } Settings::CodeFormatter::CodeFormatter(Settings *settings): diff --git a/RedPandaIDE/settingsdialog/editorcodecompletionwidget.cpp b/RedPandaIDE/settingsdialog/editorcodecompletionwidget.cpp index 1547ac0d..07eac772 100644 --- a/RedPandaIDE/settingsdialog/editorcodecompletionwidget.cpp +++ b/RedPandaIDE/settingsdialog/editorcodecompletionwidget.cpp @@ -34,7 +34,6 @@ void EditorCodeCompletionWidget::doLoad() ui->chkIgnoreCases->setChecked(pSettings->codeCompletion().ignoreCase()); ui->chkAppendFunc->setChecked(pSettings->codeCompletion().appendFunc()); ui->chkShowCodeIns->setChecked(pSettings->codeCompletion().showCodeIns()); - ui->chkClearWhenEditorHidden->setChecked(pSettings->codeCompletion().clearWhenEditorHidden()); } void EditorCodeCompletionWidget::doSave() @@ -55,7 +54,6 @@ void EditorCodeCompletionWidget::doSave() pSettings->codeCompletion().setIgnoreCase(ui->chkIgnoreCases->isChecked()); pSettings->codeCompletion().setAppendFunc(ui->chkAppendFunc->isChecked()); pSettings->codeCompletion().setShowCodeIns(ui->chkShowCodeIns->isChecked()); - pSettings->codeCompletion().setClearWhenEditorHidden(ui->chkClearWhenEditorHidden->isChecked()); pSettings->codeCompletion().save(); } diff --git a/RedPandaIDE/settingsdialog/environmentperformancewidget.cpp b/RedPandaIDE/settingsdialog/environmentperformancewidget.cpp new file mode 100644 index 00000000..d7c453d3 --- /dev/null +++ b/RedPandaIDE/settingsdialog/environmentperformancewidget.cpp @@ -0,0 +1,27 @@ +#include "environmentperformancewidget.h" +#include "ui_environmentperformancewidget.h" +#include "../settings.h" + +EnvironmentPerformanceWidget::EnvironmentPerformanceWidget(const QString& name, const QString& group, QWidget *parent) : + SettingsWidget(name,group,parent), + ui(new Ui::EnvironmentPerformanceWidget) +{ + ui->setupUi(this); +} + +EnvironmentPerformanceWidget::~EnvironmentPerformanceWidget() +{ + delete ui; +} + +void EnvironmentPerformanceWidget::doLoad() +{ + ui->chkClearWhenEditorHidden->setChecked(pSettings->codeCompletion().clearWhenEditorHidden()); +} + +void EnvironmentPerformanceWidget::doSave() +{ + pSettings->codeCompletion().setClearWhenEditorHidden(ui->chkClearWhenEditorHidden->isChecked()); + + pSettings->codeCompletion().save(); +} diff --git a/RedPandaIDE/settingsdialog/environmentperformancewidget.h b/RedPandaIDE/settingsdialog/environmentperformancewidget.h new file mode 100644 index 00000000..0162adde --- /dev/null +++ b/RedPandaIDE/settingsdialog/environmentperformancewidget.h @@ -0,0 +1,26 @@ +#ifndef ENVIRONMENTPERFORMANCEWIDGET_H +#define ENVIRONMENTPERFORMANCEWIDGET_H + +#include +#include "settingswidget.h" + +namespace Ui { +class EnvironmentPerformanceWidget; +} + +class EnvironmentPerformanceWidget : public SettingsWidget +{ + Q_OBJECT + +public: + explicit EnvironmentPerformanceWidget(const QString& name, const QString& group, QWidget *parent = nullptr); + ~EnvironmentPerformanceWidget(); + + void doLoad() override; + void doSave() override; + +private: + Ui::EnvironmentPerformanceWidget *ui; +}; + +#endif // ENVIRONMENTPERFORMANCEWIDGET_H diff --git a/RedPandaIDE/settingsdialog/environmentperformancewidget.ui b/RedPandaIDE/settingsdialog/environmentperformancewidget.ui new file mode 100644 index 00000000..8d88a084 --- /dev/null +++ b/RedPandaIDE/settingsdialog/environmentperformancewidget.ui @@ -0,0 +1,50 @@ + + + EnvironmentPerformanceWidget + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + Reduce Memory Usage + + + + + + Auto clear parsed symbols when editor hidden + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + diff --git a/RedPandaIDE/settingsdialog/settingsdialog.cpp b/RedPandaIDE/settingsdialog/settingsdialog.cpp index 4547eba3..19fda5df 100644 --- a/RedPandaIDE/settingsdialog/settingsdialog.cpp +++ b/RedPandaIDE/settingsdialog/settingsdialog.cpp @@ -18,6 +18,7 @@ #include "environmentshortcutwidget.h" #include "environmentfileassociationwidget.h" #include "environmentfolderswidget.h" +#include "environmentperformancewidget.h" #include "executorgeneralwidget.h" #include "executorproblemsetwidget.h" #include "debuggeneralwidget.h" @@ -114,6 +115,10 @@ PSettingsDialog SettingsDialog::optionDialog() widget->init(); dialog->addWidget(widget); + widget = new EnvironmentPerformanceWidget(tr("Performance"),tr("Environment")); + widget->init(); + dialog->addWidget(widget); + connect((EnvironmentFoldersWidget*)widget, &EnvironmentFoldersWidget::shouldQuitApp, dialog.get(),