浏览代码

Merge pull request #3985 from Laserlicht/fix_graphical

fixes graphical glitch when there is no savegame (ExtraOptions)
Ivan Savenko 1 年之前
父节点
当前提交
698d726cf9
共有 3 个文件被更改,包括 6 次插入7 次删除
  1. 2 2
      .github/workflows/github.yml
  2. 3 1
      client/lobby/ExtraOptionsTab.cpp
  3. 1 4
      client/lobby/OptionsTabBase.cpp

+ 2 - 2
.github/workflows/github.yml

@@ -201,8 +201,8 @@ jobs:
 
     - name: Configure
       run: |
-        if [[ ${{matrix.preset}} == linux-gcc-test ]]; then GCC13=1; fi
-        cmake -DENABLE_CCACHE:BOOL=ON --preset ${{ matrix.preset }} ${GCC13:+-DCMAKE_C_COMPILER=gcc-13 -DCMAKE_CXX_COMPILER=g++-13}
+        if [[ ${{matrix.preset}} == linux-gcc-test ]]; then GCC12=1; fi
+        cmake -DENABLE_CCACHE:BOOL=ON --preset ${{ matrix.preset }} ${GCC12:+-DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12}
 
     - name: Build
       run: |

+ 3 - 1
client/lobby/ExtraOptionsTab.cpp

@@ -10,9 +10,11 @@
 
 #include "StdInc.h"
 #include "ExtraOptionsTab.h"
+#include "../widgets/Images.h"
 
 ExtraOptionsTab::ExtraOptionsTab()
 	: OptionsTabBase(JsonPath::builtin("config/widgets/extraOptionsTab.json"))
 {
-
+	if(auto textureCampaignOverdraw = widget<CFilledTexture>("textureCampaignOverdraw"))
+		textureCampaignOverdraw->disable();
 }

+ 1 - 4
client/lobby/OptionsTabBase.cpp

@@ -428,8 +428,5 @@ void OptionsTabBase::recreate(bool campaign)
 	}
 
 	if(auto textureCampaignOverdraw = widget<CFilledTexture>("textureCampaignOverdraw"))
-	{
-		if(!campaign)
-			textureCampaignOverdraw->disable();
-	}
+		textureCampaignOverdraw->setEnabled(campaign);
 }