diff options
| author | Marisa-Chan | 2014-06-13 21:43:04 +0700 |
|---|---|---|
| committer | Marisa-Chan | 2014-06-13 21:43:04 +0700 |
| commit | 45589950c0fb1a449351e6a00ef10d42290d8bae (patch) | |
| tree | 44e4eedcb7e69d5fc386155b000ed038af07251d /gui/themes/scummclassic | |
| parent | 48360645dcd5f8fddb135b6e31ae5cae4be8d77f (diff) | |
| parent | 5c005ad3a3f1df0bc968c85c1cf0fc48e36ab0b2 (diff) | |
| download | scummvm-rg350-45589950c0fb1a449351e6a00ef10d42290d8bae.tar.gz scummvm-rg350-45589950c0fb1a449351e6a00ef10d42290d8bae.tar.bz2 scummvm-rg350-45589950c0fb1a449351e6a00ef10d42290d8bae.zip | |
Merge remote-tracking branch 'upstream/master' into zvision
Conflicts:
engines/zvision/animation/rlf_animation.cpp
engines/zvision/animation_control.h
engines/zvision/core/console.cpp
engines/zvision/core/events.cpp
engines/zvision/cursors/cursor.cpp
engines/zvision/cursors/cursor_manager.cpp
engines/zvision/cursors/cursor_manager.h
engines/zvision/fonts/truetype_font.cpp
engines/zvision/graphics/render_manager.cpp
engines/zvision/graphics/render_manager.h
engines/zvision/inventory/inventory_manager.h
engines/zvision/inventory_manager.h
engines/zvision/meta_animation.h
engines/zvision/module.mk
engines/zvision/scripting/actions.cpp
engines/zvision/scripting/control.h
engines/zvision/scripting/controls/animation_control.cpp
engines/zvision/scripting/controls/animation_control.h
engines/zvision/scripting/controls/input_control.cpp
engines/zvision/scripting/controls/lever_control.cpp
engines/zvision/scripting/controls/timer_node.cpp
engines/zvision/scripting/controls/timer_node.h
engines/zvision/scripting/puzzle.h
engines/zvision/scripting/scr_file_handling.cpp
engines/zvision/scripting/script_manager.cpp
engines/zvision/scripting/script_manager.h
engines/zvision/sidefx.cpp
engines/zvision/sound/zork_raw.cpp
engines/zvision/sound/zork_raw.h
engines/zvision/video/video.cpp
engines/zvision/video/zork_avi_decoder.h
engines/zvision/zvision.cpp
engines/zvision/zvision.h
Diffstat (limited to 'gui/themes/scummclassic')
| -rw-r--r-- | gui/themes/scummclassic/classic_layout_lowres.stx | 77 |
1 files changed, 39 insertions, 38 deletions
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index 802998df3c..506657ef31 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -687,50 +687,51 @@ </dialog> <dialog name = 'GlobalMenu' overlays = 'screen_center'> - <layout type = 'vertical' padding = '2, 2, 4, 6' center = 'true' spacing='6'> + <layout type = 'vertical' padding = '2, 2, 2, 6' center = 'true' spacing='0'> <widget name = 'Title' width = '160' - height = '4' + height = '12' /> <widget name = 'Version' width = '160' - height = '4' - /> - <space size = '1'/> - <widget name = 'Load' - width = '120' - height = '12' - /> - <widget name = 'Save' - width = '120' - height = '12' - /> - <space size = '1'/> - <widget name = 'Options' - width = '120' - height = '12' - /> - <widget name = 'Help' - width = '120' - height = '12' - /> - <widget name = 'About' - width = '120' - height = '12' - /> - <space size = '1'/> - <widget name = 'Resume' - width = '120' - height = '12' - /> - <widget name = 'RTL' - width = '120' - height = '12' - /> - <widget name = 'Quit' - width = '120' - height = '12' + height = '14' /> + <layout type = 'vertical' padding = '0, 0, 3, 0' center = 'true' spacing='6'> + <widget name = 'Load' + width = '120' + height = '12' + /> + <widget name = 'Save' + width = '120' + height = '12' + /> + <space size = '1'/> + <widget name = 'Options' + width = '120' + height = '12' + /> + <widget name = 'Help' + width = '120' + height = '12' + /> + <widget name = 'About' + width = '120' + height = '12' + /> + <space size = '1'/> + <widget name = 'Resume' + width = '120' + height = '12' + /> + <widget name = 'RTL' + width = '120' + height = '12' + /> + <widget name = 'Quit' + width = '120' + height = '12' + /> + </layout> </layout> </dialog> |