From 6954ed06a6689c0e30814a95ee8fe8403b292a16 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Wed, 5 Jan 2022 14:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E5=85=A8=E5=B1=8F=E4=BC=9A=E8=AE=A9=E5=BF=AB?=
 =?UTF-8?q?=E9=80=9F=E5=BC=80=E5=A7=8B=E6=8C=89=E9=92=AE=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20close=20#566?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/gameFuncs.lua   | 24 ++++++++++++------------
 parts/scenes/main.lua |  8 ++++++--
 parts/updateLog.lua   |  1 +
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua
index 2606af0d..49fe503b 100644
--- a/parts/gameFuncs.lua
+++ b/parts/gameFuncs.lua
@@ -119,6 +119,18 @@ do--function applySettings()
         color={-.2,1.2},
     }
     function applySettings()
+        --Apply language
+        text=LANG.get(SETTING.locale)
+        WIDGET.setLang(text.WidgetText)
+        for k,v in next,TEXTOBJ do
+            if rawget(text,k)then
+                v:set(text[k])
+            end
+        end
+
+        --Apply cursor
+        love.mouse.setVisible(SETTING.sysCursor)
+
         --Apply fullscreen
         love.window.setFullscreen(SETTING.fullscreen)
         love.resize(gc.getWidth(),gc.getHeight())
@@ -147,18 +159,6 @@ do--function applySettings()
         SHADER.fieldSatur:send('b',m[1])
         SHADER.fieldSatur:send('k',m[2])
 
-        --Apply language
-        text=LANG.get(SETTING.locale)
-        WIDGET.setLang(text.WidgetText)
-        for k,v in next,TEXTOBJ do
-            if rawget(text,k)then
-                v:set(text[k])
-            end
-        end
-
-        --Apply cursor
-        love.mouse.setVisible(SETTING.sysCursor)
-
         --Apply BG
         if SETTING.bg=='on'then
             BG.unlock()
diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua
index d0c230ca..fefd6335 100644
--- a/parts/scenes/main.lua
+++ b/parts/scenes/main.lua
@@ -27,8 +27,7 @@ function scene.sceneInit()
     scrollX=tipLength
 
     --Set quick-play-button text
-    local qpModeName=text.modes[STAT.lastPlay]and text.modes[STAT.lastPlay][1]or"["..STAT.lastPlay.."]"
-    scene.widgetList[2]:setObject(text.WidgetText.main.qplay..": "..qpModeName)
+    scene.resize()
 
     --Create demo player
     destroyPlayers()
@@ -38,6 +37,11 @@ function scene.sceneInit()
     PLAYERS[1]:setPosition(520,140,.8)
 end
 
+function scene.resize()
+    local qpModeName=text.modes[STAT.lastPlay]and text.modes[STAT.lastPlay][1]or"["..STAT.lastPlay.."]"
+    scene.widgetList[2]:setObject(text.WidgetText.main.qplay..": "..qpModeName)
+end
+
 function scene.mouseDown(x,y)
     if x>=400 and x<=880 and y>=10 and y<=110 then
         enterConsole()
diff --git a/parts/updateLog.lua b/parts/updateLog.lua
index 3d0bc5f0..081bc996 100644
--- a/parts/updateLog.lua
+++ b/parts/updateLog.lua
@@ -47,6 +47,7 @@ return[=[
         修复:
                 BGM模块资源管理问题导致的一些音频bug #557
                 自定义场地界面按超过第三个的鼠标键会报错
+                主菜单开关全屏会让快速开始按钮文本错误 #566
                 经典模式h和u难度没有干旱计数器 #546
                 自定义场地16号色的方块名位置显示错误
                 联网对战结算的l'pm公式错写成lpm的