diff options
| author | jmarshallnz <jmarshallnz@svn> | 2009-11-09 20:29:58 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2009-11-09 20:29:58 +0000 |
| commit | a666a8a90f2c5027124be572a2b8f2ff93decee7 (patch) | |
| tree | 37ad7123b03258622b2a70c62f941a38e8573935 /guilib/GUIControl.h | |
| parent | f84bc29af123f0cb2f0428a7976aa8ce95645c41 (diff) | |
fixed: Controls in grouplists would have their navigation actions overridden. We override now only if the control has no actions set. Fixes #7630.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@24466 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIControl.h')
| -rw-r--r-- | guilib/GUIControl.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/guilib/GUIControl.h b/guilib/GUIControl.h index 5846ff724b..6873da8971 100644 --- a/guilib/GUIControl.h +++ b/guilib/GUIControl.h @@ -163,8 +163,18 @@ public: virtual float GetHeight() const; virtual void SetNavigation(int up, int down, int left, int right); virtual void SetTabNavigation(int next, int prev); + + /*! \brief Set actions to perform on navigation + Navigations are set if replace is true or if there is no previously set action + \param up vector of CGUIActionDescriptors to execute on up + \param down vector of CGUIActionDescriptors to execute on down + \param left vector of CGUIActionDescriptors to execute on left + \param right vector of CGUIActionDescriptors to execute on right + \param replace Actions are set only if replace is true or there is no previously set action. Defaults to true + \sa SetNavigation, ExecuteActions + */ virtual void SetNavigationActions(const std::vector<CGUIActionDescriptor> &up, const std::vector<CGUIActionDescriptor> &down, - const std::vector<CGUIActionDescriptor> &left, const std::vector<CGUIActionDescriptor> &right); + const std::vector<CGUIActionDescriptor> &left, const std::vector<CGUIActionDescriptor> &right, bool replace = true); void ExecuteActions(const std::vector<CGUIActionDescriptor> &actions); int GetControlIdUp() const { return m_controlUp;}; int GetControlIdDown() const { return m_controlDown;}; |