Merge branch 'collaborate_mode_qt6'

Vaa3D · Feb 25, 2025 · 89d51de · 89d51de
2 parents a53c6ef + 355497a
commit 89d51de
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/v3d_main/3drenderer/renderer.cpp b/v3d_main/3drenderer/renderer.cpp
@@ -698,8 +698,8 @@ void Renderer::drawEditInfo()
         }
 
         sprintf(str, "%s", editdisplay.c_str());
-
         drawString(A0.x + td, A0.y, A0.z, str, 0, 18); // same renderText problem above, 20210825
+
 //        drawString(A0.x + td, A0.y + td, A0.z, "bigneuron.org", 0, fontsize);
         //glColor3f(1, 0, 0);		drawString(A1.x + td, A0.y, A0.z, "X");
         //glColor3f(0, 1, 0);		drawString(A0.x, A1.y + td, A0.z, "Y");
@@ -711,7 +711,6 @@ void Renderer::drawEditInfo()
     glPopMatrix();
     glMatrixMode(GL_MODELVIEW);
 
-
 }
 
 

diff --git a/v3d_main/3drenderer/v3dr_glwidget.cpp b/v3d_main/3drenderer/v3dr_glwidget.cpp
@@ -692,6 +692,7 @@ void V3dR_GLWidget::stillPaint()
 #define IS_CTRL_MODIFIER		((KM==Qt::ControlModifier) || (KM==CTRL2_MODIFIER))
 #define WITH_CTRL_MODIFIER		((KM & Qt::ControlModifier) || (KM & CTRL2_MODIFIER))
 #define IS_ALT_MODIFIER			((KM==Qt::AltModifier) || (KM==ALT2_MODIFIER))
+#define IS_ALT_SHIFT_MODIFIER   ((KM==(Qt::AltModifier | Qt::ShiftModifier)))
 #define WITH_ALT_MODIFIER		((KM & Qt::AltModifier) || (KM & ALT2_MODIFIER))
 #define IS_SHIFT_MODIFIER		((KM==Qt::ShiftModifier))
 #define WITH_SHIFT_MODIFIER		((KM & Qt::ShiftModifier))
@@ -1330,9 +1331,9 @@ void V3dR_GLWidget::handleKeyPressEvent(QKeyEvent * e)  //090428 RZC: make publi
                 )
             {
                 toggleTex2D3D();
-            }else if (IS_ALT_MODIFIER)
+            }else if (IS_ALT_MODIFIER || IS_ALT_SHIFT_MODIFIER)
             {
-                emit changeEditinput("Alt+T");
+                emit changeEditinput("Alt+T: Retyping");
                 if(!isoperating)
                     isoperating=true;
                 callStrokeRetypeMultiNeurons();//For multiple segments retyping shortcut, by ZZ,02212018

diff --git a/v3d_main/terafly/src/presentation/PMain.cpp b/v3d_main/terafly/src/presentation/PMain.cpp
@@ -2470,7 +2470,7 @@ void PMain::importDone(RuntimeException *ex, qint64 elapsed_time)
         int curWidth = uniqueInstance->width();
         uniqueInstance->resize(curWidth, screenHeight - 100);
 
-        new_win->resize(screenWidth - curWidth - 100, screenHeight - 100);
+        new_win->resize(screenWidth - curWidth - 100, screenHeight - 80);
     }
 
     //resetting some widgets