widelands

Merge lp://staging/~widelands-dev/widelands/fix_ui_bugs into lp://staging/widelands

  1. fix_ui_bugs
  2. Merge into trunk
Proposed by SirVer
Status: Merged
Merged at revision: 8450
Proposed branch: lp://staging/~widelands-dev/widelands/fix_ui_bugs
Merge into: lp://staging/widelands
Diff against target: 80 lines (+13/-6)
4 files modified
src/ui_basic/panel.cc (+0/-5)
src/ui_basic/window.cc (+6/-0)
src/ui_basic/window.h (+1/-0)
src/wui/mapview.cc (+6/-1)
To merge this branch: bzr merge lp://staging/~widelands-dev/widelands/fix_ui_bugs
Reviewer Review Type Date Requested Status
kaputtnik (community) testing Approve
GunChleoc Approve
Review via email: mp+330176@code.staging.launchpad.net

Commit message

- Revert behavior of watch window to b19: do not close when right clicked into it.
- Fix event passing for mousewheel events.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 2653. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/271823597.
Appveyor build 2475. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_ui_bugs-2475.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 2654. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/271941456.
Appveyor build 2475. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_ui_bugs-2475.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Code LGTM :)

review: Approve
Revision history for this message
SirVer (sirver) wrote :

Thanks for the code review. Waiting for feedback on testing before merging.

Revision history for this message
kaputtnik (franku) wrote :

For me all issues in the mentioned bugs are working again.

@bunnybot merge

review: Approve (testing)
Revision history for this message
kaputtnik (franku) wrote :

Uos... just see this compiler warnings on trunk (which has this branch already in). I guess that those warnings are related to this branch:

../src/ui_basic/window.cc: In Elementfunktion »virtual bool UI::Window::handle_mousewheel(uint32_t, int32_t, int32_t)«:
../src/ui_basic/window.cc:402:41: Warnung: unverwendeter Parameter »which« [-Wunused-parameter]
 bool Window::handle_mousewheel(uint32_t which, int32_t x, int32_t y) {
                                         ^~~~~
../src/ui_basic/window.cc:402:56: Warnung: unverwendeter Parameter »x« [-Wunused-parameter]
 bool Window::handle_mousewheel(uint32_t which, int32_t x, int32_t y) {
                                                        ^
../src/ui_basic/window.cc:402:67: Warnung: unverwendeter Parameter »y« [-Wunused-parameter]
 bool Window::handle_mousewheel(uint32_t which, int32_t x, int32_t y) {

Revision history for this message
SirVer (sirver) wrote :

Will fix the warnings in https://code.launchpad.net/~widelands-dev/widelands/reduce_overlay_manager_use3/+merge/330496.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: