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

Move common widgets from Game to Mods.Common.

Browse Source
This commit is contained in:
Paul Chote
2015-03-07 10:19:11 +00:00
parent eb0ea8d543
commit e5c03413cc
31 changed files with 94 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Graphics/Renderer.cs
View File

@@ -260,5 +260,10 @@ namespace OpenRA.Graphics
if (fontSheetBuilder != null)
fontSheetBuilder.Dispose();
}
public string GetClipboardText()
{
return Device.GetClipboardText();
}
}
}

38
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -172,38 +172,11 @@
<Compile Include="Traits\World\ResourceType.cs" />
<Compile Include="Traits\World\ScreenShaker.cs" />
<Compile Include="Traits\World\Shroud.cs" />
<Compile Include="Widgets\BackgroundWidget.cs" />
<Compile Include="Widgets\ButtonWidget.cs" />
<Compile Include="Widgets\ChatDisplayWidget.cs" />
<Compile Include="Widgets\CheckboxWidget.cs" />
<Compile Include="Widgets\ChromeMetrics.cs" />
<Compile Include="Widgets\ColorBlockWidget.cs" />
<Compile Include="Widgets\DropDownButtonWidget.cs" />
<Compile Include="Widgets\GridLayout.cs" />
<Compile Include="Widgets\ImageWidget.cs" />
<Compile Include="Widgets\LabelWidget.cs" />
<Compile Include="Widgets\LineGraphWidget.cs" />
<Compile Include="Widgets\ListLayout.cs" />
<Compile Include="Widgets\MapPreviewWidget.cs" />
<Compile Include="Widgets\PasswordFieldWidget.cs" />
<Compile Include="Widgets\PerfGraphWidget.cs" />
<Compile Include="Widgets\ProgressBarWidget.cs" />
<Compile Include="Widgets\ScrollItemWidget.cs" />
<Compile Include="Widgets\ScrollPanelWidget.cs" />
<Compile Include="Widgets\SliderWidget.cs" />
<Compile Include="Widgets\TextFieldWidget.cs" />
<Compile Include="Widgets\VqaPlayerWidget.cs" />
<Compile Include="Widgets\Widget.cs" />
<Compile Include="Widgets\WidgetLoader.cs" />
<Compile Include="Widgets\WidgetUtils.cs" />
<Compile Include="Widgets\WorldInteractionControllerWidget.cs" />
<Compile Include="World.cs" />
<Compile Include="WorldUtils.cs" />
<Compile Include="Network\ReplayRecorderConnection.cs" />
<Compile Include="Widgets\TooltipContainerWidget.cs" />
<Compile Include="Traits\DebugPauseState.cs" />
<Compile Include="Network\UPnP.cs" />
<Compile Include="Widgets\ClientTooltipRegionWidget.cs" />
<Compile Include="Graphics\Renderable.cs" />
<Compile Include="Graphics\Voxel.cs" />
<Compile Include="Graphics\VoxelRenderer.cs" />
@@ -211,16 +184,12 @@
<Compile Include="Graphics\VoxelProvider.cs" />
<Compile Include="Traits\BodyOrientation.cs" />
<Compile Include="Graphics\VoxelAnimation.cs" />
<Compile Include="Widgets\ViewportControllerWidget.cs" />
<Compile Include="Traits\Player\FrozenActorLayer.cs" />
<Compile Include="Graphics\Theater.cs" />
<Compile Include="Traits\Player\PlayerColorPalette.cs" />
<Compile Include="Traits\Player\PlayerHighlightPalette.cs" />
<Compile Include="Traits\World\ScreenMap.cs" />
<Compile Include="Traits\World\ActorMap.cs" />
<Compile Include="Widgets\HotkeyEntryWidget.cs" />
<Compile Include="Widgets\SpriteWidget.cs" />
<Compile Include="Widgets\RGBASpriteWidget.cs" />
<Compile Include="Scripting\ScriptContext.cs" />
<Compile Include="Scripting\ScriptActorInterface.cs" />
<Compile Include="Scripting\ScriptObjectWrapper.cs" />
@@ -236,7 +205,6 @@
<Compile Include="GameRules\RulesetCache.cs" />
<Compile Include="Support\MersenneTwister.cs" />
<Compile Include="GameInformation.cs" />
<Compile Include="Widgets\RootWidget.cs" />
<Compile Include="Map\CellLayer.cs" />
<Compile Include="Map\CellRegion.cs" />
<Compile Include="Input\IInputHandler.cs" />
@@ -259,6 +227,12 @@
<Compile Include="Support\PerfItem.cs" />
<Compile Include="Support\PerfSample.cs" />
<Compile Include="Graphics\SpriteRenderable.cs" />
<Compile Include="Widgets\Widget.cs" />
<Compile Include="Widgets\RootWidget.cs" />
<Compile Include="Widgets\WidgetLoader.cs" />
<Compile Include="Widgets\ChromeMetrics.cs" />
<Compile Include="Widgets\WidgetUtils.cs" />
<Compile Include="Widgets\WorldInteractionControllerWidget.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="FileSystem\D2kSoundResources.cs" />

1
OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using OpenRA.Mods.Common.Widgets;
using OpenRA.Mods.Common.Widgets.Logic;
using OpenRA.Widgets;

26
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -590,6 +590,32 @@
<Compile Include="Widgets\Logic\ReplayUtils.cs" />
<Compile Include="InstallUtils.cs" />
<Compile Include="Graphics\DefaultSpriteSequence.cs" />
<Compile Include="Widgets\BackgroundWidget.cs" />
<Compile Include="Widgets\ButtonWidget.cs" />
<Compile Include="Widgets\ChatDisplayWidget.cs" />
<Compile Include="Widgets\CheckboxWidget.cs" />
<Compile Include="Widgets\ClientTooltipRegionWidget.cs" />
<Compile Include="Widgets\ColorBlockWidget.cs" />
<Compile Include="Widgets\DropDownButtonWidget.cs" />
<Compile Include="Widgets\GridLayout.cs" />
<Compile Include="Widgets\HotkeyEntryWidget.cs" />
<Compile Include="Widgets\ImageWidget.cs" />
<Compile Include="Widgets\LabelWidget.cs" />
<Compile Include="Widgets\LineGraphWidget.cs" />
<Compile Include="Widgets\ListLayout.cs" />
<Compile Include="Widgets\MapPreviewWidget.cs" />
<Compile Include="Widgets\PasswordFieldWidget.cs" />
<Compile Include="Widgets\PerfGraphWidget.cs" />
<Compile Include="Widgets\ProgressBarWidget.cs" />
<Compile Include="Widgets\RGBASpriteWidget.cs" />
<Compile Include="Widgets\ScrollItemWidget.cs" />
<Compile Include="Widgets\ScrollPanelWidget.cs" />
<Compile Include="Widgets\SliderWidget.cs" />
<Compile Include="Widgets\SpriteWidget.cs" />
<Compile Include="Widgets\TextFieldWidget.cs" />
<Compile Include="Widgets\TooltipContainerWidget.cs" />
<Compile Include="Widgets\ViewportControllerWidget.cs" />
<Compile Include="Widgets\VqaPlayerWidget.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>

1
OpenRA.Mods.Common/Scripting/Media.cs
View File

@@ -11,6 +11,7 @@
using System;
using System.IO;
using OpenRA.FileFormats;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Scripting

3
OpenRA.Game/Widgets/BackgroundWidget.cs → OpenRA.Mods.Common/Widgets/BackgroundWidget.cs
View File

@@ -9,8 +9,9 @@
#endregion
using System.Drawing;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class BackgroundWidget : Widget
{

3
OpenRA.Game/Widgets/ButtonWidget.cs → OpenRA.Mods.Common/Widgets/ButtonWidget.cs
View File

@@ -10,8 +10,9 @@
using System;
using System.Drawing;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class ButtonWidget : Widget
{

3
OpenRA.Game/Widgets/ChatDisplayWidget.cs → OpenRA.Mods.Common/Widgets/ChatDisplayWidget.cs
View File

@@ -12,8 +12,9 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class ChatDisplayWidget : Widget
{

3
OpenRA.Game/Widgets/CheckboxWidget.cs → OpenRA.Mods.Common/Widgets/CheckboxWidget.cs
View File

@@ -11,8 +11,9 @@
using System;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class CheckboxWidget : ButtonWidget
{

3
OpenRA.Game/Widgets/ClientTooltipRegionWidget.cs → OpenRA.Mods.Common/Widgets/ClientTooltipRegionWidget.cs
View File

@@ -10,8 +10,9 @@
using System;
using OpenRA.Network;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class ClientTooltipRegionWidget : Widget
{

3
OpenRA.Game/Widgets/ColorBlockWidget.cs → OpenRA.Mods.Common/Widgets/ColorBlockWidget.cs
View File

@@ -10,8 +10,9 @@
using System;
using System.Drawing;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class ColorBlockWidget : Widget
{

3
OpenRA.Game/Widgets/DropDownButtonWidget.cs → OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs
View File

@@ -12,8 +12,9 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class DropDownButtonWidget : ButtonWidget
{

3
OpenRA.Game/Widgets/GridLayout.cs → OpenRA.Mods.Common/Widgets/GridLayout.cs
View File

@@ -9,8 +9,9 @@
#endregion
using System;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class GridLayout : ILayout
{

3
OpenRA.Game/Widgets/HotkeyEntryWidget.cs → OpenRA.Mods.Common/Widgets/HotkeyEntryWidget.cs
View File

@@ -11,8 +11,9 @@
using System;
using System.Drawing;
using System.Linq;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class HotkeyEntryWidget : Widget
{

3
OpenRA.Game/Widgets/ImageWidget.cs → OpenRA.Mods.Common/Widgets/ImageWidget.cs
View File

@@ -10,8 +10,9 @@
using System;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class ImageWidget : Widget
{

3
OpenRA.Game/Widgets/LabelWidget.cs → OpenRA.Mods.Common/Widgets/LabelWidget.cs
View File

@@ -11,8 +11,9 @@
using System;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public enum TextAlign { Left, Center, Right }
public enum TextVAlign { Top, Middle, Bottom }

3
OpenRA.Game/Widgets/LineGraphWidget.cs → OpenRA.Mods.Common/Widgets/LineGraphWidget.cs
View File

@@ -12,8 +12,9 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class LineGraphWidget : Widget
{

4
OpenRA.Game/Widgets/ListLayout.cs → OpenRA.Mods.Common/Widgets/ListLayout.cs
View File

@@ -8,7 +8,9 @@
*/
#endregion
namespace OpenRA.Widgets
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets
{
public class ListLayout : ILayout
{

3
OpenRA.Game/Widgets/MapPreviewWidget.cs → OpenRA.Mods.Common/Widgets/MapPreviewWidget.cs
View File

@@ -14,8 +14,9 @@ using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Network;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class SpawnOccupant
{

4
OpenRA.Game/Widgets/PasswordFieldWidget.cs → OpenRA.Mods.Common/Widgets/PasswordFieldWidget.cs
View File

@@ -8,7 +8,9 @@
*/
#endregion
namespace OpenRA.Widgets
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets
{
public class PasswordFieldWidget : TextFieldWidget
{

3
OpenRA.Game/Widgets/PerfGraphWidget.cs → OpenRA.Mods.Common/Widgets/PerfGraphWidget.cs
View File

@@ -11,8 +11,9 @@
using System.Drawing;
using System.Linq;
using OpenRA.Support;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class PerfGraphWidget : Widget
{

3
OpenRA.Game/Widgets/ProgressBarWidget.cs → OpenRA.Mods.Common/Widgets/ProgressBarWidget.cs
View File

@@ -10,8 +10,9 @@
using System;
using System.Drawing;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class ProgressBarWidget : Widget
{

3
OpenRA.Game/Widgets/RGBASpriteWidget.cs → OpenRA.Mods.Common/Widgets/RGBASpriteWidget.cs
View File

@@ -10,8 +10,9 @@
using System;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class RGBASpriteWidget : Widget
{

3
OpenRA.Game/Widgets/ScrollItemWidget.cs → OpenRA.Mods.Common/Widgets/ScrollItemWidget.cs
View File

@@ -9,8 +9,9 @@
#endregion
using System;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class ScrollItemWidget : ButtonWidget
{

3
OpenRA.Game/Widgets/ScrollPanelWidget.cs → OpenRA.Mods.Common/Widgets/ScrollPanelWidget.cs
View File

@@ -13,8 +13,9 @@ using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Primitives;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public interface ILayout
{

3
OpenRA.Game/Widgets/SliderWidget.cs → OpenRA.Mods.Common/Widgets/SliderWidget.cs
View File

@@ -11,8 +11,9 @@
using System;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class SliderWidget : Widget
{

3
OpenRA.Game/Widgets/SpriteWidget.cs → OpenRA.Mods.Common/Widgets/SpriteWidget.cs
View File

@@ -10,8 +10,9 @@
using System;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class SpriteWidget : Widget
{

5
OpenRA.Game/Widgets/TextFieldWidget.cs → OpenRA.Mods.Common/Widgets/TextFieldWidget.cs
View File

@@ -10,8 +10,9 @@
using System;
using System.Drawing;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class TextFieldWidget : Widget
{
@@ -177,7 +178,7 @@ namespace OpenRA.Widgets
((Platform.CurrentPlatform != PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Ctrl)) ||
(Platform.CurrentPlatform == PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Meta))))
{
var clipboardText = Game.Renderer.Device.GetClipboardText();
var clipboardText = Game.Renderer.GetClipboardText();
// Take only the first line of the clipboard contents
var nl = clipboardText.IndexOf('\n');

3
OpenRA.Game/Widgets/TooltipContainerWidget.cs → OpenRA.Mods.Common/Widgets/TooltipContainerWidget.cs
View File

@@ -11,8 +11,9 @@
using System;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class TooltipContainerWidget : Widget
{

3
OpenRA.Game/Widgets/ViewportControllerWidget.cs → OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
View File

@@ -14,8 +14,9 @@ using System.Linq;
using OpenRA.Graphics;
using OpenRA.Orders;
using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public enum WorldTooltipType { None, Unexplored, Actor, FrozenActor }

3
OpenRA.Game/Widgets/VqaPlayerWidget.cs → OpenRA.Mods.Common/Widgets/VqaPlayerWidget.cs
View File

@@ -13,8 +13,9 @@ using System.Drawing;
using OpenRA.FileFormats;
using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class VqaPlayerWidget : Widget
{