Merge lp://staging/~gamag/widelands/building_costs_preview into lp://staging/widelands
Proposed by
Gabriel Margiani
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 6407 | ||||
| Proposed branch: | lp://staging/~gamag/widelands/building_costs_preview | ||||
| Merge into: | lp://staging/widelands | ||||
| Diff against target: |
442 lines (+228/-21) 9 files modified
src/logic/dismantlesite.cc (+29/-15) src/logic/dismantlesite.h (+2/-0) src/ui_basic/button.cc (+5/-0) src/ui_basic/button.h (+2/-0) src/wui/buildingwindow.cc (+57/-4) src/wui/buildingwindow.h (+6/-0) src/wui/fieldaction.cc (+13/-2) src/wui/waresdisplay.cc (+86/-0) src/wui/waresdisplay.h (+28/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~gamag/widelands/building_costs_preview | ||||
| Related bugs: |
|
||||
| Related blueprints: |
Show the buildcost in the build menu
(Undefined)
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Widelands Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Adds the building costs preview as discussed in http://
(it resizes the window always)
in the same way a preview of the enhance costs and the the wares you get back by dismantling
the building is added to the building window.
(this wasn't discussed, so lets do it now)
To post a comment you must log in.
Revision history for this message
| SirVer (sirver) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Quality Work Gabriel! Very nice. Merged in 6407.
The only thing bugging me is the window resizing. It is quite distracting imho. I merged now, maybe one gets used to it. Maybe we have to rethink the way we display this information in the UI in a while.