codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs concerning negative numbers in spin inputs and sometimes returning wrong values.

This commit is contained in:
Asmageddon 2012-03-12 19:26:27 +01:00
parent 27f0e86afd
commit 010fd165c6
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
deluge/ui/console/modes/input_popup.py
View File

@ -221,9 +221,10 @@ class IntSpinInput(InputField):
self.value = int(self.valstr) self.value = int(self.valstr)
self.__limit_value() self.__limit_value()
self.valstr = "%d"%self.value self.valstr = "%d"%self.value
self.cursor = len(self.valstr)
self.cursor = colors.get_line_width(self.valstr) self.cursor = colors.get_line_width(self.valstr)
self.need_update = False self.need_update = False
elif self.need_update: elif self.need_update and self.valstr != '-':
self.real_value = True self.real_value = True
try: try:
self.value = int(self.valstr) self.value = int(self.valstr)
@ -293,7 +294,13 @@ class IntSpinInput(InputField):
if self.valstr and self.cursor < len(self.valstr): if self.valstr and self.cursor < len(self.valstr):
self.valstr = self.valstr[:self.cursor] + self.valstr[self.cursor+1:] self.valstr = self.valstr[:self.cursor] + self.valstr[self.cursor+1:]
self.need_update = True self.need_update = True
elif c == 45 and self.cursor == 0 and self.min_val < 0: elif c == 45 and self.min_val < 0:
if not self.real_value:
self.valstr = "-"
self.cursor = 1
self.real_value = True
self.need_update = True
if self.cursor != 0: return
minus_place = self.valstr.find('-') minus_place = self.valstr.find('-')
if minus_place >= 0: return if minus_place >= 0: return
self.valstr = chr(c)+self.valstr self.valstr = chr(c)+self.valstr
@ -320,6 +327,7 @@ class IntSpinInput(InputField):
def get_value(self): def get_value(self):
if self.real_value: if self.real_value:
self.__limit_value()
return self.value return self.value
else: else:
return None return None
@ -365,6 +373,7 @@ class FloatSpinInput(InputField):
self.value = self.min_val self.value = self.min_val
if (self.max_val != None) and self.value > self.max_val: if (self.max_val != None) and self.value > self.max_val:
self.value = self.max_val self.value = self.max_val
self.valstr = self.fmt % self.value
def render(self, screen, row, width, active, col=1, cursor_offset=0): def render(self, screen, row, width, active, col=1, cursor_offset=0):
if not active and self.need_update: if not active and self.need_update:
@ -378,9 +387,11 @@ class FloatSpinInput(InputField):
else: else:
self.set_value(self.valstr) self.set_value(self.valstr)
self.__limit_value() self.__limit_value()
self.valstr = self.fmt % self.value
self.cursor = len(self.valstr)
self.cursor = colors.get_line_width(self.valstr) self.cursor = colors.get_line_width(self.valstr)
self.need_update = False self.need_update = False
elif self.need_update: elif self.need_update and self.valstr != '-':
self.real_value = True self.real_value = True
try: try:
self.value = round(float(self.valstr), self.precision) self.value = round(float(self.valstr), self.precision)
@ -452,7 +463,13 @@ class FloatSpinInput(InputField):
if self.valstr and self.cursor < len(self.valstr): if self.valstr and self.cursor < len(self.valstr):
self.valstr = self.valstr[:self.cursor] + self.valstr[self.cursor+1:] self.valstr = self.valstr[:self.cursor] + self.valstr[self.cursor+1:]
self.need_update = True self.need_update = True
elif c == 45 and self.cursor == 0 and self.min_val < 0: elif c == 45 and self.min_val < 0:
if not self.real_value:
self.valstr = "-"
self.cursor = 1
self.need_update = True
self.real_value = True
if self.cursor != 0: return
minus_place = self.valstr.find('-') minus_place = self.valstr.find('-')
if minus_place >= 0: return if minus_place >= 0: return
self.valstr = chr(c)+self.valstr self.valstr = chr(c)+self.valstr
@ -497,6 +514,7 @@ class FloatSpinInput(InputField):
def get_value(self): def get_value(self):
if self.real_value: if self.real_value:
self.__limit_value()
return self.value return self.value
else: else:
return None return None