X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2Fconfig.py;h=4e467897835b90026a32dd871073598ef4e9832c;hp=3c01794ab0fdcf92e15a85313a9caae7ad434262;hb=1e595b94afee2632a87d1191e0d9fb6f698ac493;hpb=d4a15713448f51461af9f53093d9173252d06d9f

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 3c01794..4e46789 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -512,10 +512,10 @@ class ConfigText(ConfigElement, NumericalTextInput):
 		self.value = self.default = default
 
 	def validateMarker(self):
-		if self.marked_pos < 0:
-			self.marked_pos = 0
 		if self.marked_pos >= len(self.text):
 			self.marked_pos = len(self.text) - 1
+		if self.marked_pos < 0:
+			self.marked_pos = 0
 
 	#def nextEntry(self):
 	#	self.vals[1](self.getConfigPath())
@@ -529,9 +529,7 @@ class ConfigText(ConfigElement, NumericalTextInput):
 			self.marked_pos -= 1
 		elif key == KEY_RIGHT:
 			self.marked_pos += 1
-			if not self.fixed_size:
-				if self.marked_pos >= len(self.text):
-					self.text = self.text.ljust(len(self.text) + 1)
+			self.maybeExpand()
 		elif key in KEY_NUMBERS:
 			number = self.getKey(getKeyNumber(key))
 			self.text = self.text[0:self.marked_pos] + unicode(number) + self.text[self.marked_pos + 1:]
@@ -542,8 +540,14 @@ class ConfigText(ConfigElement, NumericalTextInput):
 		self.validateMarker()
 		self.changed()
 
+	def maybeExpand(self):
+		if not self.fixed_size:
+			if self.marked_pos >= len(self.text):
+				self.text = self.text.ljust(len(self.text) + 1)
+
 	def nextFunc(self):
 		self.marked_pos += 1
+		self.maybeExpand()
 		self.validateMarker()
 		self.changed()