From ba23aa93af6dfd093223d5c3d9062fb5db9223a2 Mon Sep 17 00:00:00 2001
From: royqh1979 <royqh1979@gmail.com>
Date: Sat, 6 Nov 2021 10:36:25 +0800
Subject: [PATCH] - fix: input/output/expected textedit in the problem view
 shouldn't autowrap lines  - fix: Red Panda C++ will freeze when receiving
 contents from Competitve Companion in chrome/edge

---
 NEWS.md                             |  2 ++
 RedPandaIDE/mainwindow.cpp          | 26 +++++++++++++++---
 RedPandaIDE/mainwindow.ui           | 41 ++++++++++++++++++++++++++---
 RedPandaIDE/problems/ojproblemset.h |  2 ++
 4 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 8f6a0dbd..cb4e26b6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,7 @@
 Version 0.8.1 For Dev-C++ 7 Beta
  - fix: ConsolePaurser.exe only exits when press ENTER
+ - fix: input/output/expected textedit in the problem view shouldn't autowrap lines
+ - fix: Red Panda C++ will freeze when receiving contents from Competitve Companion in chrome/edge
 
 Version 0.8 For Dev-C++ 7 Beta
  - fix: find in the current file is not correcly saved in the search history
diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp
index b1a90f24..b87f858a 100644
--- a/RedPandaIDE/mainwindow.cpp
+++ b/RedPandaIDE/mainwindow.cpp
@@ -2691,15 +2691,34 @@ void MainWindow::onProblemNameChanged(int index)
 void MainWindow::onNewProblemConnection()
 {
     QTcpSocket* clientConnection = mTcpServer.nextPendingConnection();
-    mTcpServer.connect(clientConnection, &QAbstractSocket::disconnected,
+
+    connect(clientConnection, &QAbstractSocket::disconnected,
             clientConnection, &QObject::deleteLater);
     QByteArray content;
+    int unreadCount = 0;
     while (clientConnection->state() == QTcpSocket::ConnectedState) {
-        clientConnection->waitForReadyRead();
-        content += clientConnection->readAll();
+        clientConnection->waitForReadyRead(100);
+        QByteArray readed = clientConnection->readAll();
+        if (readed.isEmpty()) {
+            unreadCount ++;
+            if (!content.isEmpty() || unreadCount>30)
+                break;
+        } else {
+            unreadCount = 0;
+        }
+        content += readed;
     }
     content += clientConnection->readAll();
+    clientConnection->write("HTTP/1.1 200 OK");
+    clientConnection->disconnectFromHost();
+//    qDebug()<<"---------";
+//    qDebug()<<content;
     content = getHTTPBody(content);
+//    qDebug()<<"*********";
+//    qDebug()<<content;
+    if (content.isEmpty()) {
+        return;
+    }
     QJsonParseError error;
     QJsonDocument doc = QJsonDocument::fromJson(content,&error);
     if (error.error!=QJsonParseError::NoError) {
@@ -2728,7 +2747,6 @@ void MainWindow::onNewProblemConnection()
             ui->lstProblemSet->setCurrentIndex(mOJProblemSetModel.index(0,0));
         }
     }
-    clientConnection->disconnectFromHost();
 }
 
 void MainWindow::onEditorClosed()
diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui
index b82a4f2f..fa230aa6 100644
--- a/RedPandaIDE/mainwindow.ui
+++ b/RedPandaIDE/mainwindow.ui
@@ -272,7 +272,7 @@
             </attribute>
             <layout class="QVBoxLayout" name="verticalLayout_6">
              <property name="spacing">
-              <number>7</number>
+              <number>3</number>
              </property>
              <property name="leftMargin">
               <number>0</number>
@@ -288,9 +288,18 @@
              </property>
              <item>
               <widget class="QLabel" name="lblProblemSet">
+               <property name="frameShape">
+                <enum>QFrame::Panel</enum>
+               </property>
+               <property name="frameShadow">
+                <enum>QFrame::Plain</enum>
+               </property>
                <property name="text">
                 <string>Problem Set</string>
                </property>
+               <property name="margin">
+                <number>5</number>
+               </property>
               </widget>
              </item>
              <item>
@@ -497,7 +506,7 @@
         <enum>QTabWidget::South</enum>
        </property>
        <property name="currentIndex">
-        <number>3</number>
+        <number>6</number>
        </property>
        <property name="iconSize">
         <size>
@@ -1089,6 +1098,10 @@
         </layout>
        </widget>
        <widget class="QWidget" name="tabProblem">
+        <attribute name="icon">
+         <iconset resource="icons.qrc">
+          <normaloff>:/icons/images/newlook24/015-compres.png</normaloff>:/icons/images/newlook24/015-compres.png</iconset>
+        </attribute>
         <attribute name="title">
          <string>Problem</string>
         </attribute>
@@ -1112,6 +1125,9 @@
            </property>
            <widget class="QWidget" name="widget_4" native="true">
             <layout class="QVBoxLayout" name="verticalLayout_7">
+             <property name="spacing">
+              <number>3</number>
+             </property>
              <property name="leftMargin">
               <number>0</number>
              </property>
@@ -1126,9 +1142,15 @@
              </property>
              <item>
               <widget class="QLabel" name="lblProblem">
+               <property name="frameShape">
+                <enum>QFrame::Box</enum>
+               </property>
                <property name="text">
                 <string>Problem</string>
                </property>
+               <property name="margin">
+                <number>5</number>
+               </property>
                <property name="openExternalLinks">
                 <bool>true</bool>
                </property>
@@ -1305,17 +1327,28 @@
               </widget>
              </item>
              <item row="1" column="0">
-              <widget class="QTextEdit" name="txtProblemCaseInput"/>
+              <widget class="QTextEdit" name="txtProblemCaseInput">
+               <property name="lineWrapMode">
+                <enum>QTextEdit::NoWrap</enum>
+               </property>
+              </widget>
              </item>
              <item row="1" column="1">
               <widget class="QTextEdit" name="txtProblemCaseOutput">
+               <property name="lineWrapMode">
+                <enum>QTextEdit::NoWrap</enum>
+               </property>
                <property name="readOnly">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="1" column="2">
-              <widget class="QTextEdit" name="txtProblemCaseExpected"/>
+              <widget class="QTextEdit" name="txtProblemCaseExpected">
+               <property name="lineWrapMode">
+                <enum>QTextEdit::NoWrap</enum>
+               </property>
+              </widget>
              </item>
             </layout>
            </widget>
diff --git a/RedPandaIDE/problems/ojproblemset.h b/RedPandaIDE/problems/ojproblemset.h
index a7a97b9f..9eb07bf2 100644
--- a/RedPandaIDE/problems/ojproblemset.h
+++ b/RedPandaIDE/problems/ojproblemset.h
@@ -42,4 +42,6 @@ struct OJProblemSet {
     QVector<POJProblem> problems;
 };
 
+using POJProblemSet  = std::shared_ptr<OJProblemSet>;
+
 #endif // OJPROBLEMSET_H