Merge branch 'master' of github.com:texstudio-org/texstudio

texstudio-org · Dec 19, 2023 · e20fc64 · e20fc64
2 parents 5b7e8cb + 5ca29d4
commit e20fc64
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -64,23 +64,23 @@ jobs:
 
       - name: Upload zip to GitHub Artifacts
         if: github.event_name == 'push'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: texstudio-win-qt6-zip
           path: ./build/package-zip/texstudio-win-qt6-${{ steps.package.outputs.VERSION_NAME }}.zip
 
       - name: Upload to GitHub Artifacts
         if: github.event_name == 'push'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: texstudio-win-qt6-exe
           path: texstudio-win-qt6-${{ steps.package.outputs.VERSION_NAME }}.exe
 
       - name: Upload release file(s)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          name: release
+          name: release-win
           path: |
             texstudio-${{ steps.package.outputs.GIT_VERSION }}-win-qt6.exe
             texstudio-${{ steps.package.outputs.GIT_VERSION }}-win-portable-qt6.zip
@@ -134,16 +134,16 @@ jobs:
         
     - name: Upload to Github Artifacts
       if: github.event_name == 'push'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: texstudio-linux
         path: texstudio-linux-${{ steps.package.outputs.VERSION_NAME }}-x86_64.AppImage
 
     - name: Upload release file(s)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: startsWith(github.ref, 'refs/tags/')
       with:
-        name: release
+        name: release-linux
         path: texstudio-${{ steps.package.outputs.GIT_VERSION }}-x86_64.AppImage
 
 
@@ -221,16 +221,16 @@ jobs:
         
     - name: Upload to Github artifacts
       if: github.event_name == 'push'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: texstudio-osx
         path: texstudio-osx-${{ steps.package.outputs.VERSION_NAME }}.dmg
 
     - name: Upload release file(s)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: startsWith(github.ref, 'refs/tags/')
       with:
-        name: release
+        name: release-osx
         path: texstudio-${{ steps.package.outputs.GIT_VERSION }}-osx.dmg
 
   release:
@@ -241,10 +241,20 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-    - name: Download temp artifact
-      uses: actions/download-artifact@v3
+    - name: Download Windows release asset(s)
+      uses: actions/download-artifact@v4
       with:
-        name: release
+        name: release-win
+
+    - name: Download Linux release asset(s)
+      uses: actions/download-artifact@v4
+      with:
+        name: release-linux
+
+    - name: Download OS X release asset(s)
+      uses: actions/download-artifact@v4
+      with:
+        name: release-osx
 
     - name: Calculate hashes
       run: |

diff --git a/src/pdfviewer/PDFDocument.cpp b/src/pdfviewer/PDFDocument.cpp
@@ -3378,6 +3378,7 @@ void PDFDocument::init(bool embedded)
     //connect(actionZoom_Out, SIGNAL(triggered()), pdfWidget, SLOT(zoomOut()));
     //connect(actionFull_Screen, SIGNAL(triggered(bool)), this, SLOT(toggleFullScreen(bool)));
     //connect(actionPresentation, SIGNAL(triggered(bool)), this, SLOT(toggleFullScreen(bool)));
+	wasFullScreen = false;
 	connect(pdfWidget, SIGNAL(changedZoom(qreal)), this, SLOT(enableZoomActions(qreal)));
 	connect(pdfWidget, SIGNAL(changedScaleOption(autoScaleOption)), this, SLOT(adjustScaleActions(autoScaleOption)));
     connect(pdfWidget, SIGNAL(syncClick(int,const QPointF&,bool)), this, SLOT(syncClick(int,const QPointF&,bool)));
@@ -4473,10 +4474,12 @@ void PDFDocument::toggleFullScreen(bool fullscreen)
 {
 	bool presentation = false;
 	if (fullscreen) {
-		// entering full-screen mode
-		wasContinuous = actionContinuous->isChecked();
-		wasShowToolBar = toolBar->isVisible();
-		pdfWidget->saveState();
+		// entering full-screen mode (maybe a second time when switching from fullscreen to presentation)
+		if (!wasFullScreen) {
+			wasContinuous = actionContinuous->isChecked();
+			wasShowToolBar = toolBar->isVisible();
+			pdfWidget->saveState();
+		}
 		statusBar()->hide();
 		toolBar->hide();
 		globalConfig->windowMaximized = isMaximized();
@@ -4525,6 +4528,7 @@ void PDFDocument::toggleFullScreen(bool fullscreen)
 			exitFullscreen = nullptr;
 		}
 	}
+	wasFullScreen = fullscreen;
 }
 
 void PDFDocument::zoomFromAction()

diff --git a/src/pdfviewer/PDFDocument.h b/src/pdfviewer/PDFDocument.h
@@ -709,6 +709,7 @@ private slots:
 	bool dwVisOutline, dwVisFonts, dwVisInfo, dwVisSearch, dwVisOverview;
 	bool wasContinuous;
 	bool wasShowToolBar;
+	bool wasFullScreen;
 	PDFSearchDock *dwSearch;
 
 	PDFSearchResult lastSearchResult;