Merge branch 'wip' into testing

This commit is contained in:
Cooldude2606
2017-12-30 17:20:05 +00:00
2 changed files with 3 additions and 3 deletions

View File

@@ -89,7 +89,7 @@ function center._center:draw(frame)
type ='frame', type ='frame',
name='tab', name='tab',
direction='vertical', direction='vertical',
style = 'image_frame' style='image_frame'
} }
tab.style.width = 510 tab.style.width = 510
tab.style.height = 305 tab.style.height = 305

View File

@@ -66,7 +66,7 @@ function popup.open(style,data,players)
type='frame', type='frame',
name='inner_frame', name='inner_frame',
direction='vertical', direction='vertical',
style=mod_gui.frame_style style='image_frame'
} }
_popup.close:draw(_frame) _popup.close:draw(_frame)
if is_type(_popup.draw,'function') then if is_type(_popup.draw,'function') then
@@ -90,7 +90,7 @@ function popup.open(style,data,players)
type='frame', type='frame',
name='inner_frame', name='inner_frame',
direction='vertical', direction='vertical',
style=mod_gui.frame_style style='image_frame'
} }
thread.data.popup.close:draw(_frame) thread.data.popup.close:draw(_frame)
if is_type(thread.data.popup.draw,'function') then if is_type(thread.data.popup.draw,'function') then