Merge branch 'wip' into testing

This commit is contained in:
Cooldude2606
2017-12-30 16:43:19 +00:00

View File

@@ -61,34 +61,36 @@ end
-- this is the default draw function if one is not provided -- this is the default draw function if one is not provided
function center._center:draw(frame) function center._center:draw(frame)
Gui.bar(frame,500) Gui.bar(frame,510)
local tab_bar = frame.add{ local tab_bar = frame.add{
type='frame', type='frame',
name='tab_bar', name='tab_bar',
style = 'image_frame', style = 'image_frame',
direction='vertical' direction='vertical'
} }
tab_bar.style.width = 500 tab_bar.style.width = 510
tab_bar.style.height = 65
local tab_bar_scroll = tab_bar.add{ local tab_bar_scroll = tab_bar.add{
type='scroll-pane', type='scroll-pane',
name='tab_bar_scroll', name='tab_bar_scroll',
horizontal_scroll_policy='auto-and-reserve-space', horizontal_scroll_policy='auto-and-reserve-space',
vertical_scroll_policy='never' vertical_scroll_policy='never'
} }
tab_bar_scroll.style.minimal_height = 40 tab_bar_scroll.style.vertically_squashable = false
tab_bar_scroll.style.width = 480 tab_bar_scroll.style.vertically_stretchable = true
tab_bar_scroll.style.width = 500
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',
direction='horizontal' direction='horizontal'
} }
Gui.bar(frame,500) Gui.bar(frame,510)
local tab = frame.add{ local tab = frame.add{
type ='frame', type ='frame',
name='tab', name='tab',
direction='vertical' direction='vertical'
} }
tab.style.width = 500 tab.style.width = 510
local tab_scroll = tab.add{ local tab_scroll = tab.add{
type ='scroll-pane', type ='scroll-pane',
name='tab_scroll', name='tab_scroll',
@@ -96,8 +98,8 @@ function center._center:draw(frame)
vertical_scroll_policy='auto' vertical_scroll_policy='auto'
} }
tab_scroll.style.height = 300 tab_scroll.style.height = 300
tab_scroll.style.width = 475 tab_scroll.style.width = 490
Gui.bar(frame,500) Gui.bar(frame,510)
local first_tab = nil local first_tab = nil
for name,button in pairs(self.tabs) do for name,button in pairs(self.tabs) do
first_tab = first_tab or name first_tab = first_tab or name