From 0ae08cd03d2b803358e8a511ecbe9b0641eefe07 Mon Sep 17 00:00:00 2001 From: Peter Badida Date: Mon, 20 Feb 2017 15:19:32 +0100 Subject: [PATCH] Fix tabbed showcase example 'pos: self.parent.pos' was called when there was no parent & position and size were correctly set from parent anyway + replace old softboy path. ref #5007 --- examples/widgets/tabbed_panel_showcase.py | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/examples/widgets/tabbed_panel_showcase.py b/examples/widgets/tabbed_panel_showcase.py index 20f5cf4fc..66f583f8a 100644 --- a/examples/widgets/tabbed_panel_showcase.py +++ b/examples/widgets/tabbed_panel_showcase.py @@ -69,13 +69,9 @@ Builder.load_string(''' "Tabs in \\'%s\\' position" %root.tab_pos)) Image: id: tab_2_content - pos:self.parent.pos - size: self.parent.size source: 'data/images/defaulttheme-0.png' Image: id: tab_3_content - pos:self.parent.pos - size: self.parent.size source: 'data/images/image-loading.gif' StandingHeader: id: sh @@ -127,13 +123,9 @@ Builder.load_string(''' "- Tabs in \\'%s\\' position" %root.tab_pos)) Image: id: tab_2_content - pos:self.parent.pos - size: self.parent.size source: 'data/images/defaulttheme-0.png' BoxLayout: id: tab_3_content - pos:self.parent.pos - size: self.parent.size BubbleButton: text: 'Press to add new tab' on_release: root.add_header() @@ -205,19 +197,15 @@ Builder.load_string(''' "4. Tabs in \\'%s\\' position" %root.tab_pos)) Image: id: tab_2_content - pos:self.parent.pos - size: self.parent.size source: 'data/images/defaulttheme-0.png' VideoPlayer: id: tab_3_content - pos:self.parent.pos - size: self.parent.size source: 'cityCC0.mpg' TabbedPanelHeader: id: def_tab content:default_content.__self__ border: 0, 0, 0, 0 - background_down: 'softboy.png' + background_down: 'cityCC0.png' background_normal:'sequenced_images/data/images/info.png' TabbedPanelHeader: id: tph @@ -228,7 +216,7 @@ Builder.load_string(''' orientation: 'vertical' Image: source: 'sequenced_images/data/images/info.png'\ - if tph.state == 'normal' else 'softboy.png' + if tph.state == 'normal' else 'cityCC0.png' Label: text: 'text & img' TabbedPanelHeader: @@ -246,7 +234,7 @@ Builder.load_string(''' Image: id: img source: 'sequenced_images/data/images/info.png'\ - if my_header.state == 'normal' else 'softboy.png' + if my_header.state == 'normal' else 'cityCC0.png' size: my_header.size allow_stretch: True keep_ratio: False