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

Make UI cursors configurable.

Browse Source
This commit is contained in:
Matthias Mailänder
2020-10-18 18:37:04 +02:00
committed by Paul Chote
parent 96c4554644
commit e7cfd2765c
7 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -16,6 +16,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Orders
{
@@ -38,6 +39,8 @@ namespace OpenRA.Mods.Common.Orders
public class PlaceBuildingOrderGenerator : IOrderGenerator
{
readonly string worldDefaultCursor = ChromeMetrics.Get<string>("WorldDefaultCursor");
class VariantWrapper
{
public readonly ActorInfo ActorInfo;
@@ -288,7 +291,10 @@ namespace OpenRA.Mods.Common.Orders
return preview != null ? preview.RenderAnnotations(wr, TopLeft) : Enumerable.Empty<IRenderable>();
}
string IOrderGenerator.GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi) { return "default"; }
string IOrderGenerator.GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
{
return worldDefaultCursor;
}
bool IOrderGenerator.HandleKeyPress(KeyInput e)
{

4
OpenRA.Mods.Common/Widgets/ButtonWidget.cs
View File

@@ -68,6 +68,8 @@ namespace OpenRA.Mods.Common.Widgets
public Action OnDoubleClick = () => { };
public Action<KeyInput> OnKeyPress = _ => { };
public string Cursor = ChromeMetrics.Get<string>("ButtonCursor");
protected readonly Ruleset ModRules;
[ObjectCreator.UseCtor]
@@ -221,6 +223,8 @@ namespace OpenRA.Mods.Common.Widgets
tooltipContainer.Value.RemoveTooltip();
}
public override string GetCursor(int2 pos) { return Cursor; }
public override int2 ChildOrigin
{
get

3
OpenRA.Mods.Common/Widgets/RadarWidget.cs
View File

@@ -38,6 +38,7 @@ namespace OpenRA.Mods.Common.Widgets
readonly int cellWidth;
readonly int previewWidth;
readonly int previewHeight;
readonly string worldDefaultCursor = ChromeMetrics.Get<string>("WorldDefaultCursor");
float radarMinimapHeight;
int frame;
@@ -283,7 +284,7 @@ namespace OpenRA.Mods.Common.Widgets
var cursor = world.OrderGenerator.GetCursor(world, cell, worldPixel, mi);
if (cursor == null)
return "default";
return worldDefaultCursor;
return Game.ModData.CursorProvider.HasCursorSequence(cursor + "-minimap") ? cursor + "-minimap" : cursor;
}