From d40b79cb1d3304f113df3091662760f585ee389e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20H=C3=B6ltt=C3=A4?= Date: Tue, 18 Dec 2018 11:38:37 +0100 Subject: Add more features for the demo app Add a common cursor indicator item that all navigable items may use for visualizing the cursor. Add a cursor navigable delegate. Make lists more generic by adding a CNItemDelegate. Add CNFlipButton that has flipping animations when used with CursorNavigation. Update Page4 with the new button type. --- plugin/cursornavigation.cpp | 2 +- plugin/cursornavigationattached.cpp | 7 ++----- plugin/spatialnavigation360.cpp | 6 +++--- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'plugin') diff --git a/plugin/cursornavigation.cpp b/plugin/cursornavigation.cpp index 9049c82..bf2d390 100644 --- a/plugin/cursornavigation.cpp +++ b/plugin/cursornavigation.cpp @@ -41,7 +41,7 @@ CursorNavigationAttached *CursorNavigation::find(qreal angle, qreal tolerance, b if (!m_currentItem) return defaultItem(); - qWarning() << "find next item, angle = " << angle << " tolerance = " << tolerance << " discrete = " << discrete; + //qWarning() << "find next item, angle = " << angle << " tolerance = " << tolerance << " discrete = " << discrete; QList candidates; diff --git a/plugin/cursornavigationattached.cpp b/plugin/cursornavigationattached.cpp index 1757d12..39a7888 100644 --- a/plugin/cursornavigationattached.cpp +++ b/plugin/cursornavigationattached.cpp @@ -176,11 +176,8 @@ void CursorNavigationAttached::moveLeft() void CursorNavigationAttached::activate() { - if (m_cursorNavigation) { - CursorNavigationAttached *item = m_cursorNavigation->m_currentItem; - if (m_cursorNavigation->action(Activate) && item) - item->activated(); - } + if (m_cursorNavigation && m_cursorNavigation->m_currentItem) + m_cursorNavigation->m_currentItem->activated(); } void CursorNavigationAttached::moveForward() diff --git a/plugin/spatialnavigation360.cpp b/plugin/spatialnavigation360.cpp index 0e6d19b..534a3d2 100644 --- a/plugin/spatialnavigation360.cpp +++ b/plugin/spatialnavigation360.cpp @@ -115,7 +115,7 @@ CursorNavigationAttached* SpatialNavigation360::getNextCandidate( * -remember to use current item's coord system as the reference!!! */ - qWarning() << "##### navigation360: start, angle = " << cmd.angle << " tolerance = " << cmd.angleTolerance; + //qWarning() << "##### navigation360: start, angle = " << cmd.angle << " tolerance = " << cmd.angleTolerance; if (candidates.isEmpty()) return nullptr; @@ -179,8 +179,8 @@ CursorNavigationAttached* SpatialNavigation360::getNextCandidate( } } - qWarning() << "##### end, directHit = " << - directHitItem << " withinTolerances = " << withinToleranceItem; + //qWarning() << "##### end, directHit = " << + // directHitItem << " withinTolerances = " << withinToleranceItem; if (directHitItem) return directHitItem; -- cgit v1.2.3