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

fix tab tooltip regression

Browse Source
This commit is contained in:
Chris Forbes
2010-04-16 18:32:21 +12:00
parent d7bd5e6ee8
commit a0f7bd358a
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Chrome.cs
View File

@@ -421,15 +421,6 @@ namespace OpenRA
} }
void AddButton(RectangleF r, Action<bool> b) { buttons.Add(Pair.New(r, b)); } void AddButton(RectangleF r, Action<bool> b) { buttons.Add(Pair.New(r, b)); }
Dictionary<string, string> CategoryNameRemaps = new Dictionary<string, string>
{
{ "Building", "Structures" },
{ "Defense", "Defenses" },
{ "Plane", "Aircraft" },
{ "Ship", "Ships" },
{ "Vehicle", "Vehicles" },
};
float? lastPowerProvidedPos; float? lastPowerProvidedPos;
float? lastPowerDrainedPos; float? lastPowerDrainedPos;

28
OpenRA.Game/Widgets/BuildPaletteWidget.cs
View File

@@ -446,7 +446,16 @@ namespace OpenRA.Widgets
Sound.Play(unit.Traits.Contains<BuildingInfo>() ? eva.BuildingSelectAudio : eva.UnitSelectAudio); Sound.Play(unit.Traits.Contains<BuildingInfo>() ? eva.BuildingSelectAudio : eva.UnitSelectAudio);
Game.IssueOrder(Order.StartProduction(world.LocalPlayer, item, Game.IssueOrder(Order.StartProduction(world.LocalPlayer, item,
Game.controller.GetModifiers().HasModifier(Modifiers.Shift) ? 5 : 1)); Game.controller.GetModifiers().HasModifier(Modifiers.Shift) ? 5 : 1));
} }
static Dictionary<string, string> CategoryNameRemaps = new Dictionary<string, string>
{
{ "Building", "Structures" },
{ "Defense", "Defenses" },
{ "Plane", "Aircraft" },
{ "Ship", "Ships" },
{ "Vehicle", "Vehicles" },
};
void DrawBuildTabs( World world, int paletteHeight) void DrawBuildTabs( World world, int paletteHeight)
{ {
@@ -469,8 +478,21 @@ namespace OpenRA.Widgets
var race = world.LocalPlayer.Country.Race; var race = world.LocalPlayer.Country.Race;
WidgetUtils.DrawRGBA(ChromeProvider.GetImage(Game.chrome.renderer,"tabs-"+tabKeys[index], race+"-"+q.Key), new float2(x, y)); WidgetUtils.DrawRGBA(ChromeProvider.GetImage(Game.chrome.renderer,"tabs-"+tabKeys[index], race+"-"+q.Key), new float2(x, y));
buttons.Add(Pair.New(new Rectangle((int)x,(int)y,(int)tabWidth,(int)tabHeight), var rect = new Rectangle((int)x,(int)y,(int)tabWidth,(int)tabHeight);
HandleTabClick(groupName, world))); buttons.Add(Pair.New(rect, HandleTabClick(groupName, world)));
if (rect.Contains(Game.chrome.lastMousePos.ToPoint()))
{
var text = CategoryNameRemaps.ContainsKey(groupName) ? CategoryNameRemaps[groupName] : groupName;
var sz = Game.chrome.renderer.BoldFont.Measure(text);
WidgetUtils.DrawPanelPartial("dialog4",
Rectangle.FromLTRB((int)rect.Left - sz.X - 30, (int)rect.Top, (int)rect.Left - 5, (int)rect.Bottom),
PanelSides.All);
Game.chrome.renderer.BoldFont.DrawText(text,
new float2(rect.Left - sz.X - 20, rect.Top + 12), Color.White);
}
y += tabHeight; y += tabHeight;
} }