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

Simplify and fix panel positioning at different zooms.

Browse Source
This commit is contained in:
Paul Chote
2018-12-09 08:08:11 +13:00
committed by reaperrr
parent 4723e5ddb9
commit ea9f12ffbc
3 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorEditLogic.cs
View File

@@ -26,7 +26,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly WorldRenderer worldRenderer; readonly WorldRenderer worldRenderer;
readonly EditorActorLayer editorActorLayer; readonly EditorActorLayer editorActorLayer;
readonly EditorViewportControllerWidget editor; readonly EditorViewportControllerWidget editor;
readonly ContainerWidget actorSelectBorder;
readonly BackgroundWidget actorEditPanel; readonly BackgroundWidget actorEditPanel;
readonly LabelWidget typeLabel; readonly LabelWidget typeLabel;
readonly TextFieldWidget actorIDField; readonly TextFieldWidget actorIDField;
@@ -41,6 +40,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly int editPanelPadding; // Padding between right edge of actor and the edit panel. readonly int editPanelPadding; // Padding between right edge of actor and the edit panel.
readonly long scrollVisibleTimeout = 100; // Delay after scrolling map before edit widget becomes visible again. readonly long scrollVisibleTimeout = 100; // Delay after scrolling map before edit widget becomes visible again.
long lastScrollTime = 0; long lastScrollTime = 0;
int2 lastScrollPosition = int2.Zero;
ActorIDStatus actorIDStatus = ActorIDStatus.Normal; ActorIDStatus actorIDStatus = ActorIDStatus.Normal;
ActorIDStatus nextActorIDStatus = ActorIDStatus.Normal; ActorIDStatus nextActorIDStatus = ActorIDStatus.Normal;
@@ -74,7 +74,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
this.worldRenderer = worldRenderer; this.worldRenderer = worldRenderer;
editorActorLayer = world.WorldActor.Trait<EditorActorLayer>(); editorActorLayer = world.WorldActor.Trait<EditorActorLayer>();
editor = widget.Parent.Get<EditorViewportControllerWidget>("MAP_EDITOR"); editor = widget.Parent.Get<EditorViewportControllerWidget>("MAP_EDITOR");
actorSelectBorder = editor.Get<ContainerWidget>("ACTOR_SELECT_BORDER");
actorEditPanel = editor.Get<BackgroundWidget>("ACTOR_EDIT_PANEL"); actorEditPanel = editor.Get<BackgroundWidget>("ACTOR_EDIT_PANEL");
typeLabel = actorEditPanel.Get<LabelWidget>("ACTOR_TYPE_LABEL"); typeLabel = actorEditPanel.Get<LabelWidget>("ACTOR_TYPE_LABEL");
@@ -101,10 +100,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
closeButton.OnClick = Close; closeButton.OnClick = Close;
deleteButton.OnClick = Delete; deleteButton.OnClick = Delete;
actorSelectBorder.IsVisible = () => CurrentActor != null actorEditPanel.IsVisible = () => CurrentActor != null
&& editor.CurrentBrush == editor.DefaultBrush && editor.CurrentBrush == editor.DefaultBrush
&& Game.RunTime > lastScrollTime + scrollVisibleTimeout; && Game.RunTime > lastScrollTime + scrollVisibleTimeout;
actorEditPanel.IsVisible = actorSelectBorder.IsVisible;
actorIDField.OnEscKey = () => actorIDField.OnEscKey = () =>
{ {
@@ -172,11 +170,14 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var actor = editor.DefaultBrush.SelectedActor; var actor = editor.DefaultBrush.SelectedActor;
if (actor != null) if (actor != null)
{ {
var origin = worldRenderer.Viewport.WorldToViewPx(new int2(actor.Bounds.X, actor.Bounds.Y)); var origin = worldRenderer.Viewport.WorldToViewPx(new int2(actor.Bounds.Right, actor.Bounds.Top));
// If we scrolled, hide the edit box for a moment // If we scrolled, hide the edit box for a moment
if (actorSelectBorder.Bounds.X != origin.X || actorSelectBorder.Bounds.Y != origin.Y) if (lastScrollPosition.X != origin.X || lastScrollPosition.Y != origin.Y)
{
lastScrollTime = Game.RunTime; lastScrollTime = Game.RunTime;
lastScrollPosition = origin;
}
// If we changed actor, move widgets // If we changed actor, move widgets
if (CurrentActor != actor) if (CurrentActor != actor)
@@ -191,8 +192,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
typeLabel.Text = truncatedType; typeLabel.Text = truncatedType;
actorIDField.CursorPosition = actor.ID.Length; actorIDField.CursorPosition = actor.ID.Length;
actorSelectBorder.Bounds.Width = actor.Bounds.Width * 2;
actorSelectBorder.Bounds.Height = actor.Bounds.Height * 2;
nextActorIDStatus = ActorIDStatus.Normal; nextActorIDStatus = ActorIDStatus.Normal;
// Remove old widgets // Remove old widgets
@@ -286,11 +285,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
buttonContainer.Bounds.Y += initContainer.Bounds.Height - oldInitHeight; buttonContainer.Bounds.Y += initContainer.Bounds.Height - oldInitHeight;
} }
actorSelectBorder.Bounds.X = origin.X;
actorSelectBorder.Bounds.Y = origin.Y;
// Set the edit panel to the right of the selection border. // Set the edit panel to the right of the selection border.
actorEditPanel.Bounds.X = origin.X + actorSelectBorder.Bounds.Width / 2 + editPanelPadding; actorEditPanel.Bounds.X = origin.X + editPanelPadding;
actorEditPanel.Bounds.Y = origin.Y; actorEditPanel.Bounds.Y = origin.Y;
} }
else else
@@ -313,7 +309,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
actorIDField.YieldKeyboardFocus(); actorIDField.YieldKeyboardFocus();
editor.DefaultBrush.SelectedActor = null; editor.DefaultBrush.SelectedActor = null;
actorSelectBorder.Visible = false;
CurrentActor = null; CurrentActor = null;
} }
} }

5
mods/cnc/chrome/editor.yaml
View File

@@ -224,11 +224,6 @@ Container@EDITOR_WORLD_ROOT:
Visible: false Visible: false
ActorPreview@DRAG_ACTOR_PREVIEW: ActorPreview@DRAG_ACTOR_PREVIEW:
Visible: false Visible: false
Container@ACTOR_SELECT_BORDER:
X: 32
Y: 32
Width: 32
Height: 32
Background@ACTOR_EDIT_PANEL: Background@ACTOR_EDIT_PANEL:
Background: panel-black Background: panel-black
Width: 269 Width: 269

5
mods/common/chrome/editor.yaml
View File

@@ -215,11 +215,6 @@ Container@EDITOR_WORLD_ROOT:
Visible: false Visible: false
Sprite@DRAG_LAYER_PREVIEW: Sprite@DRAG_LAYER_PREVIEW:
Visible: false Visible: false
Container@ACTOR_SELECT_BORDER:
X: 32
Y: 32
Width: 32
Height: 32
Background@ACTOR_EDIT_PANEL: Background@ACTOR_EDIT_PANEL:
X: 32 X: 32
Y: 32 Y: 32