[Scummvm-git-logs] scummvm master -> ba5498333b51914416765e035fc0347db84e0e19
bluegr
noreply at scummvm.org
Thu Jul 9 01:43:20 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
ba5498333b NANCY: NANCY10: Use the arrow cursor in the inventory popup
Commit: ba5498333b51914416765e035fc0347db84e0e19
https://github.com/scummvm/scummvm/commit/ba5498333b51914416765e035fc0347db84e0e19
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-09T04:41:03+03:00
Commit Message:
NANCY: NANCY10: Use the arrow cursor in the inventory popup
Fix #16929
Changed paths:
engines/nancy/ui/inventorypopup.cpp
diff --git a/engines/nancy/ui/inventorypopup.cpp b/engines/nancy/ui/inventorypopup.cpp
index 5ceeb619ac2..6a6a066260a 100644
--- a/engines/nancy/ui/inventorypopup.cpp
+++ b/engines/nancy/ui/inventorypopup.cpp
@@ -317,13 +317,6 @@ void InventoryPopup::handleInput(NancyInput &input) {
input.mousePos.x - _screenPosition.left + _uiivData->header.normalDestRect.left,
input.mousePos.y - _screenPosition.top + _uiivData->header.normalDestRect.top);
- // Item slots use kHotspot: the highlighted magnifier, which also blends a
- // held-item sprite on Nancy 10+, so it works in both "empty hand" (plain
- // magnifier) and "carrying" (magnifier + item) states. The popup chrome
- // (close button, scrollbar, filter tabs) uses kHotspotArrow instead, like
- // the other Nancy 10+ popups.
- const CursorManager::CursorType slotCursor = CursorManager::kHotspot;
-
// Scrollbar interaction takes priority while dragging.
const UISliderRecord &slider = _uiivData->header.slider;
if (_uiivData->header.sliderEnabled) {
@@ -421,14 +414,14 @@ void InventoryPopup::handleInput(NancyInput &input) {
}
if (hoveredSlot != -1) {
- g_nancy->_cursor->setCursorType(slotCursor);
+ g_nancy->_cursor->setCursorType(CursorManager::kHotspotArrow);
if (input.input & NancyInput::kLeftMouseButtonUp) {
if (heldItem != -1) {
const int16 slotItem = _slotItemIDs[hoveredSlot];
// Empty slot: drop the held item back into the inventory
- // and keep the popup open. Occupied slot: swap â held
+ // and keep the popup open. Occupied slot: swap - held
// item goes into the inventory, the clicked item becomes
// the new held item.
NancySceneState.addItemToInventory(heldItem);
More information about the Scummvm-git-logs
mailing list