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

Remove buggy classic mouse orders. Closes #3153.

Browse Source
This commit is contained in:
Paul Chote
2014-11-15 09:40:25 +13:00
parent 455d4dc97f
commit f5c09121ad
12 changed files with 53 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -27,8 +27,6 @@ namespace OpenRA
{
public static class Game
{
public static MouseButtonPreference mouseButtonPreference = new MouseButtonPreference();
public static ModData modData;
public static Settings Settings;
static WorldRenderer worldRenderer;

21
OpenRA.Game/Input/InputHandler.cs
View File

@@ -49,25 +49,4 @@ namespace OpenRA
Sync.CheckSyncUnchanged(world, () => Ui.HandleInput(input));
}
}
public class MouseButtonPreference
{
public MouseButton Action
{
get
{
return Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Left : MouseButton.Right;
}
}
public MouseButton Cancel
{
get
{
return Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Right : MouseButton.Left;
}
}
}
}

2
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -96,7 +96,7 @@ namespace OpenRA.Orders
if (self.Destroyed || !target.IsValidFor(self))
return null;
if (mi.Button == Game.mouseButtonPreference.Action)
if (mi.Button == MouseButton.Right)
{
foreach (var o in self.TraitsImplementing<IIssueOrder>()
.SelectMany(trait => trait.Orders

1
OpenRA.Game/Settings.cs
View File

@@ -129,7 +129,6 @@ namespace OpenRA
public float ViewportEdgeScrollStep = 10f;
public float UIScrollSpeed = 50f;
public bool UseClassicMouseStyle = false;
public bool AlwaysShowStatusBars = false;
public bool TeamHealthColors = false;

27
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -54,9 +54,6 @@ namespace OpenRA.Widgets
public override bool HandleMouseInput(MouseInput mi)
{
var xy = worldRenderer.Viewport.ViewToWorldPx(mi.Location);
var useClassicMouseStyle = Game.Settings.Game.UseClassicMouseStyle;
var hasBox = SelectionBox != null;
var multiClick = mi.MultiTapCount >= 2;
@@ -68,7 +65,7 @@ namespace OpenRA.Widgets
dragStart = dragEnd = xy;
// place buildings
if (!useClassicMouseStyle || !World.Selection.Actors.Any())
if (!World.Selection.Actors.Any())
ApplyOrders(World, xy, mi);
}
@@ -77,17 +74,6 @@ namespace OpenRA.Widgets
if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Up)
{
if (useClassicMouseStyle && HasMouseFocus)
{
// order units around
if (!hasBox && World.Selection.Actors.Any() && !multiClick)
{
ApplyOrders(World, xy, mi);
YieldMouseFocus(mi);
return true;
}
}
if (World.OrderGenerator is UnitOrderGenerator)
{
if (multiClick)
@@ -114,14 +100,9 @@ namespace OpenRA.Widgets
if (mi.Button == MouseButton.None && mi.Event == MouseInputEvent.Move)
dragStart = dragEnd = xy;
if (mi.Button == MouseButton.Right && mi.Event == MouseInputEvent.Down)
{
if (useClassicMouseStyle)
World.Selection.Clear();
if (!hasBox) // don't issue orders while selecting
// don't issue orders while selecting
if (mi.Button == MouseButton.Right && mi.Event == MouseInputEvent.Down && !hasBox)
ApplyOrders(World, xy, mi);
}
return true;
}
@@ -184,7 +165,7 @@ namespace OpenRA.Widgets
var mi = new MouseInput
{
Location = screenPos,
Button = Game.mouseButtonPreference.Action,
Button = MouseButton.Right,
Modifiers = Game.GetModifierKeys()
};

2
OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
View File

@@ -304,7 +304,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var gs = Game.Settings.Game;
var ks = Game.Settings.Keys;
BindCheckboxPref(panel, "CLASSICORDERS_CHECKBOX", gs, "UseClassicMouseStyle");
BindCheckboxPref(panel, "EDGESCROLL_CHECKBOX", gs, "ViewportEdgeScroll");
BindCheckboxPref(panel, "LOCKMOUSE_CHECKBOX", gs, "LockMouseWindow");
BindSliderPref(panel, "SCROLLSPEED_SLIDER", gs, "ViewportEdgeScrollStep");
@@ -453,7 +452,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return () =>
{
gs.UseClassicMouseStyle = dgs.UseClassicMouseStyle;
gs.MouseScroll = dgs.MouseScroll;
gs.LockMouseWindow = dgs.LockMouseWindow;
gs.ViewportEdgeScroll = dgs.ViewportEdgeScroll;

2
OpenRA.Mods.RA/Guard.cs
View File

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
{
if (mi.Button == Game.mouseButtonPreference.Cancel)
if (mi.Button == MouseButton.Left)
{
world.CancelInputMode();
yield break;

4
OpenRA.Mods.RA/Minelayer.cs
View File

@@ -146,7 +146,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
{
if (mi.Button == Game.mouseButtonPreference.Cancel)
if (mi.Button == MouseButton.Left)
{
world.CancelInputMode();
yield break;
@@ -157,7 +157,7 @@ namespace OpenRA.Mods.RA
.MaxByOrDefault(a => a.Info.Traits.Contains<SelectableInfo>()
? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue);
if (mi.Button == Game.mouseButtonPreference.Action && underCursor == null)
if (mi.Button == MouseButton.Right && underCursor == null)
{
minelayer.World.CancelInputMode();
yield return new Order("PlaceMinefield", minelayer, false) { TargetLocation = xy };

2
OpenRA.Mods.RA/PortableChrono.cs
View File

@@ -148,7 +148,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
{
if (mi.Button == Game.mouseButtonPreference.Cancel)
if (mi.Button == MouseButton.Left)
{
world.CancelInputMode();
yield break;

2
OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
View File

@@ -99,7 +99,7 @@ namespace OpenRA.Mods.RA.Widgets
if (actors.Any())
world.OrderGenerator = new GenericSelectTarget(actors,
"AttackMove", "attackmove", Game.mouseButtonPreference.Action);
"AttackMove", "attackmove", MouseButton.Right);
return true;
}

49
mods/cnc/chrome/settings.yaml
View File

@@ -312,52 +312,30 @@ Container@SETTINGS_PANEL:
Font: Bold
Text: Input
Align: Center
Checkbox@CLASSICORDERS_CHECKBOX:
X: 15
Y: 40
Width: 250
Height: 20
Font: Regular
Text: Left-Click Orders
Label@MOUSE_SCROLL_LABEL:
X: PARENT_RIGHT - WIDTH - 120
Y: 39
Width: 160
Height: 20
Font: Regular
Text: Middle-Mouse Scrolling:
Align: Right
DropDownButton@MOUSE_SCROLL:
X: PARENT_RIGHT - WIDTH - 15
Y: 38
Width: 100
Height: 25
Font: Regular
Text: Enabled
Checkbox@EDGESCROLL_CHECKBOX:
X: 15
Y: 70
Y: 40
Width: 130
Height: 20
Font: Regular
Text: Edge Scrolling
Checkbox@LOCKMOUSE_CHECKBOX:
X: 15
Y: 100
Y: 70
Width: 130
Height: 20
Font: Regular
Text: Lock mouse to window
Label@SCROLL_SPEED_LABEL:
X: PARENT_RIGHT - WIDTH - 270
Y: 67
Y: 37
Width: 95
Height: 25
Text: Scroll Speed:
Align: Right
Slider@SCROLLSPEED_SLIDER:
X: PARENT_RIGHT - WIDTH - 15
Y: 73
Y: 43
Width: 250
Height: 20
Ticks: 5
@@ -365,19 +343,34 @@ Container@SETTINGS_PANEL:
MaximumValue: 50
Label@UI_SCROLL_SPEED_LABEL:
X: PARENT_RIGHT - WIDTH - 270
Y: 97
Y: 67
Width: 95
Height: 25
Text: UI Scroll Speed:
Align: Right
Slider@UI_SCROLLSPEED_SLIDER:
X: PARENT_RIGHT - WIDTH - 15
Y: 103
Y: 73
Width: 250
Height: 20
Ticks: 5
MinimumValue: 1
MaximumValue: 100
Label@MOUSE_SCROLL_LABEL:
X: PARENT_RIGHT - WIDTH - 120
Y: 99
Width: 160
Height: 20
Font: Regular
Text: Middle-Mouse Scrolling:
Align: Right
DropDownButton@MOUSE_SCROLL:
X: PARENT_RIGHT - WIDTH - 15
Y: 98
Width: 100
Height: 25
Font: Regular
Text: Enabled
Label@HOTKEYS_TITLE:
Y: 135
Width: PARENT_RIGHT

49
mods/ra/chrome/settings.yaml
View File

@@ -316,52 +316,30 @@ Background@SETTINGS_PANEL:
Width: PARENT_RIGHT - 10
Height: PARENT_BOTTOM
Children:
Checkbox@CLASSICORDERS_CHECKBOX:
X: 15
Y: 40
Width: 250
Height: 20
Font: Regular
Text: Left-Click Orders
Label@MOUSE_SCROLL_LABEL:
X: PARENT_RIGHT - WIDTH - 120
Y: 39
Width: 160
Height: 20
Font: Regular
Text: Middle-Mouse Scrolling:
Align: Right
DropDownButton@MOUSE_SCROLL:
X: PARENT_RIGHT - WIDTH - 15
Y: 38
Width: 100
Height: 25
Font: Regular
Text: Enabled
Checkbox@EDGESCROLL_CHECKBOX:
X: 15
Y: 70
Y: 40
Width: 130
Height: 20
Font: Regular
Text: Edge Scrolling
Checkbox@LOCKMOUSE_CHECKBOX:
X: 15
Y: 100
Y: 70
Width: 130
Height: 20
Font: Regular
Text: Lock mouse to window
Label@SCROLL_SPEED_LABEL:
X: PARENT_RIGHT - WIDTH - 270
Y: 67
Y: 37
Width: 95
Height: 25
Text: Scroll Speed:
Align: Right
Slider@SCROLLSPEED_SLIDER:
X: PARENT_RIGHT - WIDTH - 15
Y: 73
Y: 43
Width: 250
Height: 20
Ticks: 5
@@ -369,19 +347,34 @@ Background@SETTINGS_PANEL:
MaximumValue: 50
Label@UI_SCROLL_SPEED_LABEL:
X: PARENT_RIGHT - WIDTH - 270
Y: 97
Y: 67
Width: 95
Height: 25
Text: UI Scroll Speed:
Align: Right
Slider@UI_SCROLLSPEED_SLIDER:
X: PARENT_RIGHT - WIDTH - 15
Y: 103
Y: 73
Width: 250
Height: 20
Ticks: 5
MinimumValue: 1
MaximumValue: 100
Label@MOUSE_SCROLL_LABEL:
X: PARENT_RIGHT - WIDTH - 120
Y: 99
Width: 160
Height: 20
Font: Regular
Text: Middle-Mouse Scrolling:
Align: Right
DropDownButton@MOUSE_SCROLL:
X: PARENT_RIGHT - WIDTH - 15
Y: 98
Width: 100
Height: 25
Font: Regular
Text: Enabled
Label@HOTKEYS_TITLE:
Y: 135
Width: PARENT_RIGHT