Merge lp://staging/~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus into lp://staging/widelands
Proposed by
GunChleoc
| Status: | Merged |
|---|---|
| Merged at revision: | 8161 |
| Proposed branch: | lp://staging/~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus |
| Merge into: | lp://staging/widelands |
| Diff against target: |
562 lines (+159/-96) 12 files modified
src/ui_basic/box.cc (+9/-1) src/ui_basic/box.h (+1/-0) src/ui_fsmenu/base.cc (+5/-0) src/ui_fsmenu/base.h (+5/-0) src/ui_fsmenu/main.cc (+50/-45) src/ui_fsmenu/main.h (+2/-2) src/ui_fsmenu/main_menu.cc (+11/-1) src/ui_fsmenu/main_menu.h (+8/-4) src/ui_fsmenu/multiplayer.cc (+33/-21) src/ui_fsmenu/multiplayer.h (+2/-2) src/ui_fsmenu/singleplayer.cc (+31/-18) src/ui_fsmenu/singleplayer.h (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tino | Approve | ||
|
Review via email:
|
|||
Commit message
The main, multiplayer and single player menus now relayout themselves when fullscreen mode is toggled.
To post a comment you must log in.
Revision history for this message
| Tino (tino79) | # |
review:
Approve
Revision history for this message
| GunChleoc (gunchleoc) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for the review :)
@bunnybot merge