Merge lp://staging/~widelands-dev/widelands/fix-dropdowns into lp://staging/widelands
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 9160 | ||||
Proposed branch: | lp://staging/~widelands-dev/widelands/fix-dropdowns | ||||
Merge into: | lp://staging/widelands | ||||
Diff against target: |
2577 lines (+782/-513) 44 files modified
data/templates/default/init.lua (+20/-0) src/editor/CMakeLists.txt (+2/-0) src/editor/ui_menus/main_menu_new_map.cc (+5/-34) src/editor/ui_menus/main_menu_new_map.h (+3/-4) src/editor/ui_menus/main_menu_random_map.cc (+15/-57) src/editor/ui_menus/main_menu_random_map.h (+2/-2) src/editor/ui_menus/map_size_box.cc (+76/-0) src/editor/ui_menus/map_size_box.h (+57/-0) src/editor/ui_menus/player_menu.cc (+10/-10) src/editor/ui_menus/tool_resize_options_menu.cc (+21/-58) src/editor/ui_menus/tool_resize_options_menu.h (+3/-4) src/graphic/style_manager.cc (+2/-1) src/graphic/styles/font_style.h (+1/-0) src/graphic/styles/table_style.h (+6/-2) src/graphic/text/rt_parse.cc (+4/-2) src/graphic/text_layout.cc (+7/-0) src/graphic/text_layout.h (+2/-0) src/scripting/lua_ui.cc (+135/-32) src/scripting/lua_ui.h (+38/-1) src/ui_basic/button.cc (+1/-3) src/ui_basic/button.h (+0/-3) src/ui_basic/checkbox.cc (+2/-2) src/ui_basic/checkbox.h (+2/-2) src/ui_basic/dropdown.cc (+93/-59) src/ui_basic/dropdown.h (+42/-22) src/ui_basic/icongrid.cc (+1/-1) src/ui_basic/icongrid.h (+1/-1) src/ui_basic/listselect.cc (+98/-74) src/ui_basic/listselect.h (+30/-40) src/ui_basic/panel.cc (+10/-3) src/ui_basic/panel.h (+3/-2) src/ui_basic/radiobutton.cc (+1/-1) src/ui_basic/radiobutton.h (+1/-1) src/ui_basic/slider.h (+0/-1) src/ui_basic/unique_window.cc (+7/-1) src/ui_fsmenu/launch_game.cc (+3/-3) src/ui_fsmenu/launch_spg.cc (+2/-0) src/ui_fsmenu/options.cc (+12/-10) src/wui/economy_options_window.cc (+1/-1) src/wui/fieldaction.cc (+1/-1) src/wui/game_client_disconnected.cc (+3/-2) src/wui/game_message_menu.cc (+17/-25) src/wui/multiplayersetupgroup.cc (+12/-8) src/wui/seafaring_statistics_menu.cc (+30/-40) |
||||
To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands/fix-dropdowns | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Klaus Halfmann | testplay | Needs Fixing | |
Review via email:
|
Commit message
Dropdown fixes and improvements
- Fix positioning of dropdown lists on fullscreen switches
- Define dropdown list height by number of items
- Add dropdowns to Lua interface
- Panel::
- Create styles for hotkeys and reduce number of render calls in listselect
- Get rid of map width/height code duplication in the editor
- Add support for using dropdowns as toolbar menus with hotkeys
- Fix toggling of minimized UniqueWindows
Description of the change
I pulled out some code from
https:/
to make it more reviewable, because that branch has become too big.
The new dropdown functionality in the Lua interface and for toolbar menus is not being used in this branch, but it can be tested with the other branch.
Continuous integration builds have changed state:
Travis build 5113. State: failed. Details: https:/ /travis- ci.org/ widelands/ widelands/ builds/ 540070598. /ci.appveyor. com/project/ widelands- dev/widelands/ build/_ widelands_ dev_widelands_ fix_dropdowns- 4895.
Appveyor build 4895. State: failed. Details: https:/