Merge branch 'dev' into render-system

Blinue · Dec 12, 2023 · 18adc08 · 18adc08
2 parents 490a4ea + 934829e
commit 18adc08
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.11'
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.11'
 

diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 

diff --git a/src/Magpie.App/Resources.language-pt-BR.resw b/src/Magpie.App/Resources.language-pt-BR.resw
@@ -823,4 +823,7 @@
   <data name="Home_Shortcuts_Scale.Description" xml:space="preserve">
     <value>Redimensionar a janela em primeiro plano ou interromper o redimensionamento</value>
   </data>
+  <data name="About_DeveloperModeEnabled" xml:space="preserve">
+    <value>Modo desenvolvedor está habilitado.</value>
+  </data>
 </root>
diff --git a/src/Magpie.App/Resources.language-zh-Hant.resw b/src/Magpie.App/Resources.language-zh-Hant.resw
@@ -466,7 +466,7 @@
     <value>顯示卡</value>
   </data>
   <data name="Profile_Performance_ShowFPS.Header" xml:space="preserve">
-    <value>顯示畫面幀數</value>
+    <value>顯示畫面影格速率</value>
   </data>
   <data name="About_Feedback.Header" xml:space="preserve">
     <value>回饋</value>
@@ -778,4 +778,49 @@
   <data name="Overlay_FPS_Unlock" xml:space="preserve">
     <value>解除鎖定</value>
   </data>
-</root>
+  <data name="About_DeveloperModeEnabled" xml:space="preserve">
+    <value>已啟用開發者模式。</value>
+  </data>
+  <data name="FileDialog_ExeFile" xml:space="preserve">
+    <value>可執行檔案</value>
+  </data>
+  <data name="Home_Shortcuts_Overlay.Description" xml:space="preserve">
+    <value>縮放時監視彩現效能</value>
+  </data>
+  <data name="FileDialog_JsonFile" xml:space="preserve">
+    <value>JSON 檔案</value>
+  </data>
+  <data name="Overlay_Profiler_Timings" xml:space="preserve">
+    <value>處理時間</value>
+  </data>
+  <data name="Overlay_Profiler_FrameStatistics" xml:space="preserve">
+    <value>影格統計資料</value>
+  </data>
+  <data name="About_Version_CommitId" xml:space="preserve">
+    <value>提交</value>
+  </data>
+  <data name="Overlay_Profiler" xml:space="preserve">
+    <value>效能分析</value>
+  </data>
+  <data name="Profile_MoreOptions_ChangeExecutableForLaunching.Text" xml:space="preserve">
+    <value>更改啟動時的可執行檔案</value>
+  </data>
+  <data name="Overlay_Profiler_FrameStatistics_SwitchToFrameRates" xml:space="preserve">
+    <value>切換為影格速率</value>
+  </data>
+  <data name="Overlay_Profiler_Timings_Total" xml:space="preserve">
+    <value>總共</value>
+  </data>
+  <data name="SelectLauncherDialog_Title" xml:space="preserve">
+    <value>選擇可執行檔案來啟動程式</value>
+  </data>
+  <data name="Home_Shortcuts_Scale.Description" xml:space="preserve">
+    <value>縮放前景視窗或停止縮放</value>
+  </data>
+  <data name="Settings_Advanced_AllowScalingMaximized.Title" xml:space="preserve">
+    <value>允許縮放已最大化或全螢幕的視窗</value>
+  </data>
+  <data name="Overlay_Profiler_FrameStatistics_SwitchToFrameTimings" xml:space="preserve">
+    <value>切換為影格生成時間</value>
+  </data>
+</root>
diff --git a/src/Magpie.Core/ScalingRuntime.h b/src/Magpie.Core/ScalingRuntime.h
@@ -51,8 +51,9 @@ class ScalingRuntime {
 	std::atomic<HWND> _hwndSrc;
 	winrt::event<winrt::delegate<bool>> _isRunningChangedEvent;
 
-	std::thread _scalingThread;
 	winrt::Windows::System::DispatcherQueueController _dqc{ nullptr };
+	// 应在 _dqc 后初始化
+	std::thread _scalingThread;
 };
 
 }