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 github.com:tito/kivy

This commit is contained in:
Mathieu Virbel 2011-07-21 12:37:43 +02:00
parent b0e9ae0005 257702ca87
commit cf787ac065
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kivy/uix/image.py
View File

@ -127,6 +127,19 @@ class Image(Widget):
default to False default to False
''' '''
keep_ratio = BooleanProperty(True)
'''If False along with allow_stretch being True, the normalized image
size will be maximized to fit in the image box disregarding the image
ratio.
Otherwise, if the box is too high, the image will be not strech more
than 1:1 pixels
.. versionadded:: 1.0.8
:data:`keep_ratio` is a :class:`~kivy.properties.BooleanProperty`,
default to True
'''
def get_norm_image_size(self): def get_norm_image_size(self):
if not self.texture: if not self.texture:
return self.size return self.size
@ -136,6 +149,8 @@ class Image(Widget):
# ensure that the width is always maximized to the containter width # ensure that the width is always maximized to the containter width
if self.allow_stretch: if self.allow_stretch:
if not self.keep_ratio:
return w, h
iw = w iw = w
else: else:
iw = min(w, tw) iw = min(w, tw)