From 9b1b81e368ae5291d148f4021176d85994c52888 Mon Sep 17 00:00:00 2001
From: Roy Qu <royqh1979@gmail.com>
Date: Fri, 20 Oct 2023 11:17:46 +0800
Subject: [PATCH] 2.26 cleanup

---
 RedPandaIDE/RedPandaIDE.pro | 17 ++++++++++-------
 RedPandaIDE/editor.cpp      | 19 +++++++++++++------
 Red_Panda_CPP.pro           |  4 ----
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro
index 7cb815a3..be240f08 100644
--- a/RedPandaIDE/RedPandaIDE.pro
+++ b/RedPandaIDE/RedPandaIDE.pro
@@ -9,13 +9,12 @@ CONFIG += nokey
 # uncomment the following line to enable sdcc support
 CONFIG += ENABLE_SDCC
 
-isEmpty(APP_NAME) {
-    APP_NAME = RedPandaCPP
-}
 
-isEmpty(APP_VERSION) {
-    APP_VERSION = 2.25
-}
+APP_NAME = RedPandaCPP
+
+APP_VERSION = 2.26
+
+TEST_VERSION = alpha1
 
 contains(QMAKE_HOST.arch, x86_64):{
     DEFINES += ARCH_X86_64=1
@@ -52,7 +51,11 @@ DEFINES += _WIN32_WINNT=0x0601
 DEFINES += PREFIX=\\\"$${PREFIX}\\\"
 DEFINES += LIBEXECDIR=\\\"$${LIBEXECDIR}\\\"
 DEFINES += APP_NAME=\\\"$${APP_NAME}\\\"
-DEFINES += REDPANDA_CPP_VERSION=\\\"$${APP_VERSION}\\\"
+isEmpty(TEST_VERSION) {
+    DEFINES += REDPANDA_CPP_VERSION=\\\"$${APP_VERSION}\\\"
+} else {
+    DEFINES += REDPANDA_CPP_VERSION=\\\"$${APP_VERSION}-$${TEST_VERSION}\\\"
+}
 
 gcc {
     QMAKE_CXXFLAGS_RELEASE += -Werror=return-type
diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp
index ba566429..42d1eda3 100644
--- a/RedPandaIDE/editor.cpp
+++ b/RedPandaIDE/editor.cpp
@@ -708,11 +708,18 @@ void Editor::keyPressEvent(QKeyEvent *event)
     });
     if (event->modifiers() == Qt::ControlModifier
             && event->key() == Qt::Key_Control
-            && !pMainWindow->completionPopup()->isVisible()
-            && !pMainWindow->headerCompletionPopup()->isVisible()
+            && !mCompletionPopup->isVisible()
+            && !mHeaderCompletionPopup->isVisible()
             ) {
         setMouseTracking(true);
         handled=true;
+        QMouseEvent mouseEvent{
+            QEvent::MouseMove,
+                    mapFromGlobal(QCursor::pos()),
+                    Qt::NoButton,
+                    Qt::NoButton,
+                    Qt::ControlModifier};
+        mouseMoveEvent( &mouseEvent );
         return;
     }
     if (readOnly())
@@ -1337,9 +1344,9 @@ bool Editor::event(QEvent *event)
     if ((event->type() == QEvent::HoverEnter || event->type() == QEvent::HoverMove)
             && qApp->mouseButtons() == Qt::NoButton
             && pSettings->editor().enableTooltips()
-            && !pMainWindow->completionPopup()->isVisible()
+            && !mCompletionPopup->isVisible()
             && !pMainWindow->functionTip()->isVisible()
-            && !pMainWindow->headerCompletionPopup()->isVisible()) {
+            && !mHeaderCompletionPopup->isVisible()) {
         cancelHint();
         mTooltipTimer.stop();
         if (pSettings->editor().tipsDelay()>0) {
@@ -1393,7 +1400,7 @@ void Editor::inputMethodEvent(QInputMethodEvent *event)
     QString s = event->commitString();
     if (s.isEmpty())
         return;
-    if (pMainWindow->completionPopup()->isVisible()) {
+    if (mCompletionPopup->isVisible()) {
         onCompletionInputMethod(event);
         return;
     } else {
@@ -4152,7 +4159,7 @@ QString Editor::getHintForFunction(const PStatement &statement, const QString& f
 
 void Editor::updateFunctionTip(bool showTip)
 {
-    if (pMainWindow->completionPopup()->isVisible()) {
+    if (mCompletionPopup->isVisible()) {
         pMainWindow->functionTip()->hide();
         return;
     }
diff --git a/Red_Panda_CPP.pro b/Red_Panda_CPP.pro
index c7e6d357..d0bbce1b 100644
--- a/Red_Panda_CPP.pro
+++ b/Red_Panda_CPP.pro
@@ -12,10 +12,6 @@ consolepauser.subdir = tools/consolepauser
 redpanda_qt_utils.subdir = libs/redpanda_qt_utils
 qsynedit.subdir = libs/qsynedit
 
-APP_NAME = RedPandaCPP
-
-APP_VERSION = 2.25
-
 # Add the dependencies so that the RedPandaIDE project can add the depended programs
 # into the main app bundle
 RedPandaIDE.depends = astyle consolepauser qsynedit