Commit 8444507f authored by Jack Jansen's avatar Jack Jansen

Use FrameWork.windowbounds(), fixed idle routine

parent dce32a93
...@@ -18,14 +18,15 @@ class TEWindow(ScrolledWindow): ...@@ -18,14 +18,15 @@ class TEWindow(ScrolledWindow):
def open(self, path, name, data): def open(self, path, name, data):
self.path = path self.path = path
self.name = name self.name = name
r = (40, 40, 400, 300) r = windowbounds(400, 400)
w = Win.NewWindow(r, name, 1, 0, -1, 1, 0x55555555) w = Win.NewWindow(r, name, 1, 0, -1, 1, 0x55555555)
self.wid = w self.wid = w
r2 = (0, 0, 345, 245) vr = 0, 0, r[2]-r[0]-15, r[3]-r[1]-15
dr = (0, 0, vr[2], 0)
Qd.SetPort(w) Qd.SetPort(w)
Qd.TextFont(4) Qd.TextFont(4)
Qd.TextSize(9) Qd.TextSize(9)
self.ted = TE.TENew(r2, r2) self.ted = TE.TENew(dr, vr)
self.ted.TEAutoView(1) self.ted.TEAutoView(1)
self.ted.TESetText(data) self.ted.TESetText(data)
w.DrawGrowIcon() w.DrawGrowIcon()
...@@ -44,7 +45,7 @@ class TEWindow(ScrolledWindow): ...@@ -44,7 +45,7 @@ class TEWindow(ScrolledWindow):
vx = self.scalebarvalue(dr[0], dr[2]-dr[0], vr[0], vr[2]) vx = self.scalebarvalue(dr[0], dr[2]-dr[0], vr[0], vr[2])
vy = self.scalebarvalue(dr[1], dr[1]+height, vr[1], vr[3]) vy = self.scalebarvalue(dr[1], dr[1]+height, vr[1], vr[3])
print dr, vr, height, vx, vy print dr, vr, height, vx, vy
return vx, vy return None, vy
def scrollbar_callback(self, which, what, value): def scrollbar_callback(self, which, what, value):
if which == 'y': if which == 'y':
...@@ -67,18 +68,7 @@ class TEWindow(ScrolledWindow): ...@@ -67,18 +68,7 @@ class TEWindow(ScrolledWindow):
self.ted.TEPinScroll(0, delta) self.ted.TEPinScroll(0, delta)
print 'SCROLL Y', delta print 'SCROLL Y', delta
else: else:
if what == 'set': pass # No horizontal scrolling
return # XXXX
if what == '-':
delta = self.ted.viewRect[2]/10
elif what == '--':
delta = self.ted.viewRect[2]/2
elif what == '+':
delta = +self.ted.viewRect[2]/10
elif what == '++':
delta = +self.ted.viewRect[2]/2
self.ted.TEPinScroll(delta, 0)
def do_activate(self, onoff, evt): def do_activate(self, onoff, evt):
print "ACTIVATE", onoff print "ACTIVATE", onoff
...@@ -337,8 +327,8 @@ class Ped(Application): ...@@ -337,8 +327,8 @@ class Ped(Application):
# #
def idle(self, *args): def idle(self, *args):
for l in self._windows.values(): if self.active:
l.do_idle() self.active.do_idle()
def main(): def main():
App = Ped() App = Ped()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment