Merge branch 'wip' into testing

This commit is contained in:
Cooldude2606
2017-12-30 16:11:51 +00:00

View File

@@ -76,7 +76,7 @@ function center._center:draw(frame)
vertical_scroll_policy='never' vertical_scroll_policy='never'
} }
tab_bar_scroll.style.minimal_height = 40 tab_bar_scroll.style.minimal_height = 40
tab_bar_scroll.style.width = 500 tab_bar_scroll.style.width = 490
local tab_bar_scroll_flow = tab_bar_scroll.add{ local tab_bar_scroll_flow = tab_bar_scroll.add{
type='flow', type='flow',
name='tab_bar_scroll_flow', name='tab_bar_scroll_flow',
@@ -88,6 +88,7 @@ function center._center:draw(frame)
name='tab', name='tab',
direction='vertical' direction='vertical'
} }
tab.style.width = 500
local tab_scroll = tab.add{ local tab_scroll = tab.add{
type ='scroll-pane', type ='scroll-pane',
name='tab_scroll', name='tab_scroll',