use 32bit APIs for control values, refactor slightly
This commit is contained in:
parent
52a42e9888
commit
2dd4d1600a
|
@ -94,6 +94,19 @@ class ControlWidget(Wbase.ClickableWidget):
|
||||||
|
|
||||||
def gettitle(self):
|
def gettitle(self):
|
||||||
return self._title
|
return self._title
|
||||||
|
|
||||||
|
def set(self, value):
|
||||||
|
if self._control:
|
||||||
|
self._control.SetControl32BitValue(value)
|
||||||
|
else:
|
||||||
|
self._value = value
|
||||||
|
|
||||||
|
def get(self):
|
||||||
|
if self._control:
|
||||||
|
return self._control.GetControl32BitValue()
|
||||||
|
else:
|
||||||
|
return self._value
|
||||||
|
|
||||||
|
|
||||||
class Button(ControlWidget):
|
class Button(ControlWidget):
|
||||||
|
|
||||||
|
@ -165,19 +178,7 @@ class CheckBox(ControlWidget):
|
||||||
|
|
||||||
def toggle(self):
|
def toggle(self):
|
||||||
self.set(not self.get())
|
self.set(not self.get())
|
||||||
|
|
||||||
def set(self, value):
|
|
||||||
if self._control:
|
|
||||||
self._control.SetControlValue(value)
|
|
||||||
else:
|
|
||||||
self._value = value
|
|
||||||
|
|
||||||
def get(self):
|
|
||||||
if self._control:
|
|
||||||
return self._control.GetControlValue()
|
|
||||||
else:
|
|
||||||
return self._value
|
|
||||||
|
|
||||||
|
|
||||||
class RadioButton(ControlWidget):
|
class RadioButton(ControlWidget):
|
||||||
|
|
||||||
|
@ -217,13 +218,7 @@ class RadioButton(ControlWidget):
|
||||||
button._control.SetControlValue(button == self)
|
button._control.SetControlValue(button == self)
|
||||||
else:
|
else:
|
||||||
button._value = (button == self)
|
button._value = (button == self)
|
||||||
|
|
||||||
def get(self):
|
|
||||||
if self._control:
|
|
||||||
return self._control.GetControlValue()
|
|
||||||
else:
|
|
||||||
return self._value
|
|
||||||
|
|
||||||
|
|
||||||
class Scrollbar(ControlWidget):
|
class Scrollbar(ControlWidget):
|
||||||
|
|
||||||
|
@ -234,9 +229,9 @@ class Scrollbar(ControlWidget):
|
||||||
ControlWidget.__init__(self, possize, "", procID, callback, value, min, max)
|
ControlWidget.__init__(self, possize, "", procID, callback, value, min, max)
|
||||||
|
|
||||||
# interface
|
# interface
|
||||||
def set(self, value):
|
# def set(self, value):
|
||||||
if self._callback:
|
# if self._callback:
|
||||||
Wbase.CallbackCall(self._callback, 1, value)
|
# Wbase.CallbackCall(self._callback, 1, value)
|
||||||
|
|
||||||
def up(self):
|
def up(self):
|
||||||
if self._callback:
|
if self._callback:
|
||||||
|
@ -255,16 +250,19 @@ class Scrollbar(ControlWidget):
|
||||||
Wbase.CallbackCall(self._callback, 1, '--')
|
Wbase.CallbackCall(self._callback, 1, '--')
|
||||||
|
|
||||||
def setmin(self, min):
|
def setmin(self, min):
|
||||||
self._control.SetControlMinimum(min)
|
self._control.SetControl32BitMinimum(min)
|
||||||
|
|
||||||
def setmax(self, min):
|
def setmax(self, max):
|
||||||
self._control.SetControlMinimum(max)
|
self._control.SetControl32BitMaximum(max)
|
||||||
|
|
||||||
|
def setviewsize(self, view):
|
||||||
|
self._control.SetControlViewSize(view)
|
||||||
|
|
||||||
def getmin(self):
|
def getmin(self):
|
||||||
return self._control.GetControlMinimum()
|
return self._control.GetControl32BitMinimum()
|
||||||
|
|
||||||
def getmax(self):
|
def getmax(self):
|
||||||
return self._control.GetControlMinimum()
|
return self._control.GetControl32BitMaximum()
|
||||||
|
|
||||||
# internals
|
# internals
|
||||||
def click(self, point, modifiers):
|
def click(self, point, modifiers):
|
||||||
|
@ -299,7 +297,7 @@ class Scrollbar(ControlWidget):
|
||||||
|
|
||||||
def _hit(self, part):
|
def _hit(self, part):
|
||||||
if part == Controls.inThumb:
|
if part == Controls.inThumb:
|
||||||
value = self._control.GetControlValue()
|
value = self._control.GetControl32BitValue()
|
||||||
elif part == Controls.inUpButton:
|
elif part == Controls.inUpButton:
|
||||||
value = "+"
|
value = "+"
|
||||||
elif part == Controls.inDownButton:
|
elif part == Controls.inDownButton:
|
||||||
|
@ -329,19 +327,7 @@ class Scrollbar(ControlWidget):
|
||||||
else:
|
else:
|
||||||
Qd.FrameRect(self._bounds)
|
Qd.FrameRect(self._bounds)
|
||||||
self.GetWindow().ValidWindowRect(self._bounds)
|
self.GetWindow().ValidWindowRect(self._bounds)
|
||||||
|
|
||||||
def set(self, value):
|
|
||||||
if self._control:
|
|
||||||
self._control.SetControlValue(value)
|
|
||||||
else:
|
|
||||||
self._value = value
|
|
||||||
|
|
||||||
def get(self):
|
|
||||||
if self._control:
|
|
||||||
return self._control.GetControlValue()
|
|
||||||
else:
|
|
||||||
return self._value
|
|
||||||
|
|
||||||
|
|
||||||
def _scalebarvalue(absmin, absmax, curmin, curmax):
|
def _scalebarvalue(absmin, absmax, curmin, curmax):
|
||||||
if curmin <= absmin and curmax >= absmax:
|
if curmin <= absmin and curmax >= absmax:
|
||||||
|
|
Loading…
Reference in New Issue