From ca5a9adec45c56c514e0a4bbb1a94c89a1db6d92 Mon Sep 17 00:00:00 2001 From: satbaby Date: Mon, 2 May 2011 12:05:30 +0000 Subject: [PATCH] http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/board310-coolstream-svn/10572-svn-1419/ git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1424 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/widget/menue.cpp | 12 ++++++++---- src/gui/widget/menue.h | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index accdb7d4f..0f459bb36 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -574,10 +574,14 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) } break; case (CRCInput::RC_left): - if ((hasItem() && (selected < 0 || !items[selected]->can_arrow)) || - g_settings.menu_left_exit) { - msg = CRCInput::RC_timeout; - break; + { + CMenuItem* itemX = items[selected]; + int menu_left_exit = (itemX->isNumberChooser() == 1) ? 0 : g_settings.menu_left_exit; + if ((hasItem() && (selected < 0 || !items[selected]->can_arrow)) || + menu_left_exit) { + msg = CRCInput::RC_timeout; + break; + } } case (CRCInput::RC_right): case (CRCInput::RC_ok): diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 9ca12ee41..6578fecbb 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -131,6 +131,8 @@ class CMenuItem virtual void paintItemCaption(const bool select_mode, const int &item_height, const char * left_text=NULL, const char * right_text=NULL); virtual void paintItemSlider( const bool select_mode, const int &item_height, const int &optionvalue, const int &factor, const char * left_text=NULL, const char * right_text=NULL); + + virtual int isNumberChooser(void) const{return 0;} }; class CMenuSeparator : public CMenuItem @@ -259,6 +261,7 @@ private: int paint(bool selected, bool last = false); int exec(CMenuTarget* parent); + int isNumberChooser(void) const{return 1;} }; class CMenuOptionChooser : public CAbstractMenuOptionChooser