Add ability to move to and from the up button in the cheats panel with the dpad, fix oopsie with cheat category name text, update Usage.md

This commit is contained in:
Gericom
2026-04-18 13:15:25 +02:00
parent 97762b14d3
commit 9f9f0143a2
4 changed files with 33 additions and 7 deletions

View File

@@ -256,14 +256,20 @@ SharedPtr<View> RecyclerView::MoveFocusVertical(const SharedPtr<View>& currentFo
if (!_selectedItem || currentFocus.GetPointer() != _selectedItem->view.GetPointer())
{
// incoming focus
if (direction != FocusMoveDirection::Right)
if (direction == FocusMoveDirection::Right)
{
return nullptr;
int idx = (-_yOffset + currentFocus->GetPosition().y - _yPadding + ((_ySpacing + _itemHeight) >> 1)) / (_ySpacing + _itemHeight) * _columns;
SetSelectedItem(std::clamp(idx, 0, ((int)_itemCount - 1) / _columns * _columns));
return _selectedItem != nullptr ? _selectedItem->view : SharedFromThis();
}
else if (direction == FocusMoveDirection::Down)
{
int idx = (-_xOffset + currentFocus->GetPosition().x - _xPadding + ((_xSpacing + _itemWidth) >> 1)) / (_xSpacing + _itemWidth);
SetSelectedItem(std::clamp(idx, 0, _columns - 1));
return _selectedItem != nullptr ? _selectedItem->view : SharedFromThis();
}
int idx = (-_yOffset + currentFocus->GetPosition().y - _yPadding + ((_ySpacing + _itemHeight) >> 1)) / (_ySpacing + _itemHeight) * _columns;
SetSelectedItem(std::clamp(idx, 0, ((int)_itemCount - 1) / _columns * _columns));
return _selectedItem != nullptr ? _selectedItem->view : SharedFromThis();
return nullptr;
}
int column = _selectedItem->itemIdx % _columns;

View File

@@ -128,7 +128,7 @@ void CheatsBottomSheetView::Update()
else if (_currentCheatCategory != _viewModel->GetCurrentCheatCategory()
&& _viewModel->GetCurrentCheatCategory() != nullptr)
{
// _secondaryLabel->SetText(_viewModel->GetCurrentCheatCategory()->GetName());
_secondaryLabel->SetText(_viewModel->GetCurrentCheatCategory()->GetName());
UpdateCheatList();
}
}
@@ -223,6 +223,25 @@ void CheatsBottomSheetView::Draw(GraphicsContext& graphicsContext)
graphicsContext.ResetClipArea();
}
SharedPtr<View> CheatsBottomSheetView::MoveFocus(const SharedPtr<View>& currentFocus, FocusMoveDirection direction, View* source)
{
if (!currentFocus)
{
return nullptr;
}
if (source == _cheatListRecycler.GetPointer() && direction == FocusMoveDirection::Up && _viewModel->IsInSubCategory())
{
return _upButton;
}
else if (source == _upButton.GetPointer() && direction == FocusMoveDirection::Down)
{
return _cheatListRecycler->MoveFocus(currentFocus, direction, this);
}
return nullptr;
}
bool CheatsBottomSheetView::HandleInput(const InputProvider& inputProvider, FocusManager& focusManager)
{
if (inputProvider.Triggered(InputKey::B))

View File

@@ -22,6 +22,7 @@ public:
void InitVram(const VramContext& vramContext) override;
void Update() override;
void Draw(GraphicsContext& graphicsContext) override;
SharedPtr<View> MoveFocus(const SharedPtr<View>& currentFocus, FocusMoveDirection direction, View* source) override;
bool HandleInput(const InputProvider& inputProvider, FocusManager& focusManager) override;
void Focus(FocusManager& focusManager) override