epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give a sensible error instead of spawning inaccessible filepickers when Fullscreen.

Browse Source
This commit is contained in:
Paul Chote
2011-05-21 17:53:58 +12:00
parent cb53bcd17d
commit 74d068423b
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Cnc/Widgets/CncInstallFromCDLogic.cs
View File

@@ -13,6 +13,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.FileFormats.Graphics;
using OpenRA.Widgets; using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets namespace OpenRA.Mods.Cnc.Widgets
@@ -47,6 +48,13 @@ namespace OpenRA.Mods.Cnc.Widgets
void PromptForCD() void PromptForCD()
{ {
if (Game.Settings.Graphics.Mode == WindowMode.Fullscreen)
{
statusLabel.GetText = () => "Error: Installing from Fullscreen mode is not supported";
panel.GetWidget("BACK_BUTTON").IsVisible = () => true;
return;
}
progressBar.SetIndeterminate(true); progressBar.SetIndeterminate(true);
Game.Utilities.PromptFilepathAsync("Select CONQUER.MIX on the C&C CD", path => Game.RunAfterTick(() => Install(path))); Game.Utilities.PromptFilepathAsync("Select CONQUER.MIX on the C&C CD", path => Game.RunAfterTick(() => Install(path)));
} }

8
OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs
View File

@@ -13,6 +13,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.FileFormats.Graphics;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
@@ -214,6 +215,13 @@ namespace OpenRA.Mods.Cnc.Widgets
void PromptForCD() void PromptForCD()
{ {
if (Game.Settings.Graphics.Mode == WindowMode.Fullscreen)
{
statusLabel.GetText = () => "Error: Installing from Fullscreen mode is not supported";
panel.GetWidget("BACK_BUTTON").IsVisible = () => true;
return;
}
progressBar.SetIndeterminate(true); progressBar.SetIndeterminate(true);
statusLabel.GetText = () => "Waiting for file"; statusLabel.GetText = () => "Waiting for file";
Game.Utilities.PromptFilepathAsync("Select SCORES.MIX on the C&C CD", path => Install(path)); Game.Utilities.PromptFilepathAsync("Select SCORES.MIX on the C&C CD", path => Install(path));