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

Merge HardwareCursor and SoftwareCursor into CursorManager.

Browse Source
This commit is contained in:
Paul Chote
2020-01-17 22:48:57 +00:00
committed by Matthias Mailänder
parent d7f43b33c7
commit 847db5e59b
7 changed files with 291 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Widgets/MouseAttachmentWidget.cs
View File

@@ -20,14 +20,12 @@ namespace OpenRA.Mods.Common.Widgets
Sprite sprite;
readonly WorldRenderer worldRenderer;
readonly CursorProvider cursorProvider;
string palette;
int2 location;
[ObjectCreator.UseCtor]
public MouseAttachmentWidget(ModData modData, WorldRenderer worldRenderer)
{
cursorProvider = modData.CursorProvider;
this.worldRenderer = worldRenderer;
}
@@ -35,9 +33,8 @@ namespace OpenRA.Mods.Common.Widgets
{
if (sprite != null && palette != null)
{
var scale = Game.Cursor is SoftwareCursor && cursorProvider.DoubleCursorSize ? 2 : 1;
var directionPalette = worldRenderer.Palette(palette);
WidgetUtils.DrawSHPCentered(sprite, ChildOrigin, directionPalette, scale);
WidgetUtils.DrawSHPCentered(sprite, ChildOrigin, directionPalette, Game.Cursor.DoubleCursorSize ? 2 : 1);
}
}

6
OpenRA.Mods.Common/Widgets/TooltipContainerWidget.cs
View File

@@ -19,7 +19,6 @@ namespace OpenRA.Mods.Common.Widgets
public class TooltipContainerWidget : Widget
{
static readonly Action Nothing = () => { };
readonly CursorProvider cursorProvider;
public int2 CursorOffset = new int2(0, 20);
public int BottomEdgeYOffset = -5;
@@ -30,7 +29,6 @@ namespace OpenRA.Mods.Common.Widgets
public TooltipContainerWidget()
{
cursorProvider = Game.ModData.CursorProvider;
IsVisible = () => Game.RunTime > Viewport.LastMoveRunTime + TooltipDelayMilliseconds;
}
@@ -54,7 +52,7 @@ namespace OpenRA.Mods.Common.Widgets
{
get
{
var pos = Viewport.LastMousePos + (cursorProvider.DoubleCursorSize ? CursorOffset * 2 : CursorOffset);
var pos = Viewport.LastMousePos + (Game.Cursor.DoubleCursorSize ? CursorOffset * 2 : CursorOffset);
if (tooltip != null)
{
// If the tooltip overlaps the right edge of the screen, move it left until it fits
@@ -63,7 +61,7 @@ namespace OpenRA.Mods.Common.Widgets
// If the tooltip overlaps the bottom edge of the screen, switch tooltip above cursor
if (pos.Y + tooltip.Bounds.Bottom > Game.Renderer.Resolution.Height)
pos = pos.WithY(Viewport.LastMousePos.Y + (cursorProvider.DoubleCursorSize ? 2 : 1) * BottomEdgeYOffset - tooltip.Bounds.Height);
pos = pos.WithY(Viewport.LastMousePos.Y + (Game.Cursor.DoubleCursorSize ? 2 : 1) * BottomEdgeYOffset - tooltip.Bounds.Height);
}
return pos;