Mercurial > fife-parpg
diff engine/extensions/pychan/widgets/buttons.py @ 255:51cc05d862f2
Merged editor_rewrite branch to trunk.
This contains changes that may break compatibility against existing clients.
For a list of changes that may affect your client, see: http://wiki.fifengine.de/Changes_to_pychan_and_FIFE_in_editor_rewrite_branch
| author | cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Mon, 08 Jun 2009 16:00:02 +0000 |
| parents | a2d5e2721489 |
| children | 48c99636453e |
line wrap: on
line diff
--- a/engine/extensions/pychan/widgets/buttons.py Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/extensions/pychan/widgets/buttons.py Mon Jun 08 16:00:02 2009 +0000 @@ -100,9 +100,9 @@ return (self.real_widget.getDownXOffset(), self.real_widget.getDownYOffset()) offset = property(_getOffset,_setOffset) - def resizeToContent(self): + def resizeToContent(self, recurse=True): self.height = max(self._upimage.getHeight(),self._downimage.getHeight(),self._hoverimage.getHeight()) + self.margins[1]*2 - self.width = max(self._upimage.getWidth(),self._downimage.getWidth(),self._hoverimage.getWidth()) + self.margins[1]*2 + self.width = max(self._upimage.getWidth(),self._downimage.getWidth(),self._hoverimage.getWidth()) + self.margins[0]*2 class ToggleButton(BasicTextWidget): """ @@ -186,6 +186,8 @@ return (self.real_widget.getDownXOffset(), self.real_widget.getDownYOffset()) offset = property(_getOffset,_setOffset) - def resizeToContent(self): - self.height = max(self._upimage.getHeight(),self._downimage.getHeight(),self._hoverimage.getHeight()) + self.margins[1]*2 - self.width = max(self._upimage.getWidth(),self._downimage.getWidth(),self._hoverimage.getWidth()) + self.margins[1]*2 + def resizeToContent(self, recurse=True): + th = self.real_font.getHeight()+self.real_widget.getSpacing() + tw = self.real_font.getWidth(text2gui(self.text))+self.real_widget.getSpacing() + self.height = max(self._upimage.getHeight(),self._downimage.getHeight(),self._hoverimage.getHeight(),th) + self.margins[1]*2 + self.width = max(self._upimage.getWidth(),self._downimage.getWidth(),self._hoverimage.getWidth(),tw) + self.margins[0]*2