Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/kivy/kivy

This commit is contained in:
Matthew Einhorn 2014-04-04 17:45:59 -04:00
parent a3149536c2 d0b7d46cc0
commit bf8c985cba
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/sources/installation/installation-windows.rst
View File

@ -25,8 +25,12 @@ Installing the portable version
:scale: 75%
#. In the folder where you unzipped the package, you have a script called `kivy.bat`.
Use this file for launching any kivy application as described below
Use this file for launching any kivy application as described below.
.. note::
Launching the kivy.bat file will open a command window already set up to run kivy's
Python. The environment settings are only changed for this command window and will
not effect the system environment.
.. _windows-run-app:

10
kivy/core/text/text_pygame.py
View File

@ -14,6 +14,7 @@ except:
raise
pygame_cache = {}
pygame_font_handles = {}
pygame_cache_order = []
# init pygame font
@ -40,12 +41,13 @@ class LabelPygame(LabelBase):
fontid = self._get_font_id()
if fontid not in pygame_cache:
# try first the file if it's a filename
fontobject = None
font_handle = fontobject = None
fontname = self.options['font_name_r']
ext = fontname.split('.')[-1]
if ext.lower() == 'ttf':
# fontobject
fontobject = pygame.font.Font(fontname,
font_handle = open(fontname, 'rb')
fontobject = pygame.font.Font(font_handle,
int(self.options['font_size']))
# fallback to search a system font
@ -60,12 +62,16 @@ class LabelPygame(LabelBase):
fontobject = pygame.font.Font(font,
int(self.options['font_size']))
pygame_cache[fontid] = fontobject
pygame_font_handles[fontid] = font_handle
pygame_cache_order.append(fontid)
# to prevent too much file open, limit the number of opened fonts to 64
while len(pygame_cache_order) > 64:
popid = pygame_cache_order.pop(0)
del pygame_cache[popid]
font_handle = pygame_font_handles.pop(popid)
if font_handle is not None:
font_handle.close()
return pygame_cache[fontid]

2
kivy/tests/test_fonts.py
View File

@ -6,7 +6,7 @@ class FontTestCase(unittest.TestCase):
def setUp(self):
import os
self.font_name = os.path.join(os.path.dirname(__file__), 'कीवी.ttf')
self.font_name = os.path.join(os.path.dirname(__file__), u'कीवी.ttf')
if not os.path.exists(self.font_name):
from zipfile import ZipFile
with ZipFile(os.path.join(os.path.dirname(__file__),