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

Add scroll buttons that appear in the production palette when icons exceed available space #7227

Browse Source 
scroll up and down buttons: add disabled status, make dynamic, make smaller

Rename MaxIconRows to MaxIconRowOffset for clarity

Clean up scrolling logic, reset row position when switching tab
This commit is contained in:
sinaptik
2014-12-30 20:20:57 +13:00
parent b97ccc3465
commit b6b2b1a942
4 changed files with 280 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs
View File

@@ -36,6 +36,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
Action<bool> selectTab = reverse =>
{
palette.CurrentQueue = queues.FirstOrDefault(q => q.Enabled);
// When a tab is selected, scroll to the top because the current row position may be invalid for the new tab
palette.ScrollToTop();
};
Func<ButtonWidget, Hotkey> getKey = _ => Hotkey.Invalid;
@@ -134,7 +137,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var ticker = widget.Get<LogicTickerWidget>("PRODUCTION_TICKER");
ticker.OnTick = () =>
{
if (palette.CurrentQueue == null || palette.IconCount == 0)
if (palette.CurrentQueue == null || palette.DisplayedIconCount == 0)
{
// Select the first active tab
foreach (var b in typesContainer.Children)
@@ -148,6 +151,45 @@ namespace OpenRA.Mods.RA.Widgets.Logic
}
}
};
// Hook up scroll up and down buttons on the palette
var scrollDown = widget.GetOrNull<ButtonWidget>("SCROLL_DOWN_BUTTON");
if (scrollDown != null)
{
scrollDown.OnClick = palette.ScrollDown;
scrollDown.IsVisible = () => palette.TotalIconCount > (palette.MaxIconRowOffset * palette.Columns);
scrollDown.IsDisabled = () => !palette.CanScrollDown;
}
var scrollUp = widget.GetOrNull<ButtonWidget>("SCROLL_UP_BUTTON");
if (scrollUp != null)
{
scrollUp.OnClick = palette.ScrollUp;
scrollUp.IsVisible = () => palette.TotalIconCount > (palette.MaxIconRowOffset * palette.Columns);
scrollUp.IsDisabled = () => !palette.CanScrollUp;
}
SetMaximumVisibleRows(palette);
}
static void SetMaximumVisibleRows(ProductionPaletteWidget productionPalette)
{
var screenHeight = Game.Renderer.Resolution.Height;
// Get height of currently displayed icons
var containerWidget = Ui.Root.GetOrNull<ContainerWidget>("SIDEBAR_PRODUCTION");
if (containerWidget == null)
return;
var sidebarProductionHeight = containerWidget.Bounds.Y;
// Check if icon heights exceed y resolution
var maxItemsHeight = screenHeight - sidebarProductionHeight;
productionPalette.MaxIconRowOffset = (maxItemsHeight / productionPalette.IconSize.Y) - 1;
}
}
}