traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added vspacepixels. 

Integrated with stdwinq.
This commit is contained in:
Guido van Rossum 1991-08-16 13:24:20 +00:00
parent 48154be152
commit 14d53bf164
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/lib-stdwin/formatter.py
View File

@ -20,7 +20,7 @@ class formatter():
self.v = top # Top of current line self.v = top # Top of current line
self.center = 0 self.center = 0
self.justify = 1 self.justify = 1
self.setfont('') # Current font self.setfont('') # Default font
self._reset() # Prepare for new line self._reset() # Prepare for new line
return self return self
# #
@ -122,10 +122,14 @@ class formatter():
# Vertical space is expressed in fractions of the current # Vertical space is expressed in fractions of the current
# font's line height. # font's line height.
# #
def vspace(self, dy): def vspace(self, lines):
self.vspacepixels(int(lines * self.d.lineheight()))
#
# Add vertical space given in pixels.
#
def vspacepixels(self, dv):
self.flush() self.flush()
dy = int(float(dy) * float(self.d.lineheight())) self.v = self.v + dv
self.v = self.v + dy
# #
# Set temporary (hanging) indent, for paragraph start. # Set temporary (hanging) indent, for paragraph start.
# First flush. # First flush.
@ -149,7 +153,7 @@ class formatter():
# Test procedure # Test procedure
# #
def test(): def test():
import stdwin import stdwin, stdwinq
from stdwinevents import * from stdwinevents import *
try: try:
import mac import mac
@ -170,7 +174,7 @@ def test():
w = stdwin.open(title) w = stdwin.open(title)
winsize = w.getwinsize() winsize = w.getwinsize()
while 1: while 1:
type, window, detail = stdwin.getevent() type, window, detail = stdwinq.getevent()
if type = WE_CLOSE: if type = WE_CLOSE:
break break
elif type = WE_SIZE: elif type = WE_SIZE:

16
Lib/stdwin/formatter.py
View File

@ -20,7 +20,7 @@ class formatter():
self.v = top # Top of current line self.v = top # Top of current line
self.center = 0 self.center = 0
self.justify = 1 self.justify = 1
self.setfont('') # Current font self.setfont('') # Default font
self._reset() # Prepare for new line self._reset() # Prepare for new line
return self return self
# #
@ -122,10 +122,14 @@ class formatter():
# Vertical space is expressed in fractions of the current # Vertical space is expressed in fractions of the current
# font's line height. # font's line height.
# #
def vspace(self, dy): def vspace(self, lines):
self.vspacepixels(int(lines * self.d.lineheight()))
#
# Add vertical space given in pixels.
#
def vspacepixels(self, dv):
self.flush() self.flush()
dy = int(float(dy) * float(self.d.lineheight())) self.v = self.v + dv
self.v = self.v + dy
# #
# Set temporary (hanging) indent, for paragraph start. # Set temporary (hanging) indent, for paragraph start.
# First flush. # First flush.
@ -149,7 +153,7 @@ class formatter():
# Test procedure # Test procedure
# #
def test(): def test():
import stdwin import stdwin, stdwinq
from stdwinevents import * from stdwinevents import *
try: try:
import mac import mac
@ -170,7 +174,7 @@ def test():
w = stdwin.open(title) w = stdwin.open(title)
winsize = w.getwinsize() winsize = w.getwinsize()
while 1: while 1:
type, window, detail = stdwin.getevent() type, window, detail = stdwinq.getevent()
if type = WE_CLOSE: if type = WE_CLOSE:
break break
elif type = WE_SIZE: elif type = WE_SIZE: