Mercurial > fife-parpg
changeset 655:cdebc30c9c4a
* Made the dynamic widget test in the pychan_demo work/look a little better
* Fixed a small bug in the shooter demo (thanks to TAbracadabra for pointing it out)
| author | prock@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Thu, 21 Oct 2010 20:00:36 +0000 |
| parents | 5d6b1820b953 |
| children | 99e3ef63495b |
| files | demos/pychan_demo/gui/dynamic.xml demos/shooter/scripts/common/baseobject.py |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/demos/pychan_demo/gui/dynamic.xml Thu Oct 21 18:50:50 2010 +0000 +++ b/demos/pychan_demo/gui/dynamic.xml Thu Oct 21 20:00:36 2010 +0000 @@ -1,10 +1,10 @@ -<Window title="Dynamic widgets."> +<Window title="Dynamic widgets." background_image="gui/backgrounds/background.png"> <Label text="ClickLabel text:" /> - <ScrollArea size="200,100" vertical_scrollbar="0"> - <TextBox name="labelText" text="Add some text here."/> + <TextBox name="labelText" text="Add some text here."/> + <ScrollArea min_size="100,100" vertical_scrollbar="1"> + <VBox name="labelBox" border_size="1"> + </VBox> </ScrollArea> - <VBox name="labelBox" min_size="0,100" border_size="1" background_image="gui/backgrounds/background.png" opaque="0"> - </VBox> <HBox> <Button name="addButton" text="Add one label!"/> <Spacer />
--- a/demos/shooter/scripts/common/baseobject.py Thu Oct 21 18:50:50 2010 +0000 +++ b/demos/shooter/scripts/common/baseobject.py Thu Oct 21 20:00:36 2010 +0000 @@ -66,7 +66,7 @@ self._instance = self._layer.getInstance(self._name) self._instance.thisown = 0 else: - self._instnace = None + self._instance = None def start(self): """