diff options
| author | Jonathan Marshall <jmarshall@never.you.mind> | 2011-08-10 12:00:04 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2011-08-10 12:00:04 +1200 |
| commit | 57d61a94215d1cddb53018495490908c941469a0 (patch) | |
| tree | 9a3c72ce71bf70e86f5d60958c7182c800981edf /addons | |
| parent | 1dabf2daa5b07b9d403d575e5a2445d040262fa2 (diff) | |
| parent | df5dad39d1108371d475262399e46e26e70f4a13 (diff) | |
Merge branch 'onbackcontrols'
* onbackcontrols:
some initial skin work for <onback>
refactor the handling of ACTION_NAV_BACK at the window level ensuring controls get a chance to deal with it first
ensure lists pass <onback> through to the base class
add <onback> for skin controls - closes #11419
cleanup CGUIControl::OnAction
Conflicts:
xbmc/windows/GUIMediaWindow.cpp
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.confluence/720p/MyVideoNav.xml | 1 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/MyVideoPlaylist.xml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml index 1e93c96da1..de024eb0a9 100644 --- a/addons/skin.confluence/720p/MyVideoNav.xml +++ b/addons/skin.confluence/720p/MyVideoNav.xml @@ -60,6 +60,7 @@ <onright>50</onright> <onup>9000</onup> <ondown>9000</ondown> + <onback>50</onback> <itemgap>0</itemgap> <control type="label" id="200"> <width>250</width> diff --git a/addons/skin.confluence/720p/MyVideoPlaylist.xml b/addons/skin.confluence/720p/MyVideoPlaylist.xml index 84583281dc..5f93ea92e8 100644 --- a/addons/skin.confluence/720p/MyVideoPlaylist.xml +++ b/addons/skin.confluence/720p/MyVideoPlaylist.xml @@ -25,6 +25,7 @@ <height>600</height> <onleft>9000</onleft> <onright>50</onright> + <onback>50</onback> <onup>9000</onup> <ondown>9000</ondown> <itemgap>0</itemgap> @@ -100,4 +101,4 @@ <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> -</window>
\ No newline at end of file +</window> |