Merge lp://qastaging/~sil2100/nux/revert_640 into lp://qastaging/nux
Proposed by
Łukasz Zemczak
| Status: | Rejected |
|---|---|
| Rejected by: | Łukasz Zemczak |
| Proposed branch: | lp://qastaging/~sil2100/nux/revert_640 |
| Merge into: | lp://qastaging/nux |
| Diff against target: |
5504 lines (+216/-4518) 48 files modified
.bzrignore (+0/-2) Nux/Area.cpp (+0/-33) Nux/Area.h (+0/-19) Nux/BaseWindow.cpp (+0/-23) Nux/BaseWindow.h (+0/-10) Nux/Features.h.in (+0/-14) Nux/GeisAdapter.cpp (+0/-528) Nux/GeisAdapter.h (+0/-122) Nux/Gesture.cpp (+0/-295) Nux/Gesture.h (+0/-170) Nux/GestureBroker.cpp (+0/-200) Nux/GestureBroker.h (+0/-63) Nux/GesturesSubscription.cpp (+0/-379) Nux/GesturesSubscription.h (+0/-181) Nux/InputArea.cpp (+1/-77) Nux/InputArea.h (+0/-79) Nux/Layout.cpp (+0/-20) Nux/Layout.h (+0/-4) Nux/MainLoopGLib.cpp (+2/-22) Nux/Makefile.am (+1/-20) Nux/View.cpp (+0/-23) Nux/View.h (+0/-7) Nux/WindowCompositor.cpp (+0/-69) Nux/WindowCompositor.h (+0/-29) Nux/WindowThread.cpp (+177/-246) Nux/WindowThread.h (+24/-40) NuxCore/Rect.cpp (+0/-6) NuxCore/Rect.h (+0/-1) NuxGraphics/Events.h (+1/-5) NuxGraphics/GestureEvent.cpp (+0/-80) NuxGraphics/GestureEvent.h (+0/-162) NuxGraphics/GraphicsDisplayWin.cpp (+1/-6) NuxGraphics/GraphicsDisplayWin.h (+1/-4) NuxGraphics/GraphicsDisplayX11.cpp (+2/-8) NuxGraphics/GraphicsDisplayX11.h (+1/-4) NuxGraphics/Makefile.am (+2/-14) NuxGraphics/nux-graphics.pc.in (+1/-1) configure.ac (+2/-54) examples/Makefile.am (+0/-8) examples/gestures.cpp (+0/-100) tests/FakeGestureEvent.h (+0/-63) tests/Makefile.am (+0/-7) tests/geis_mock.cpp (+0/-483) tests/geis_mock.h (+0/-148) tests/gtest-nux-geisadapter.cpp (+0/-230) tests/gtest-nux-gesturebroker.cpp (+0/-142) tests/gtest-nux-main.cpp (+0/-17) tests/gtest-nux-windowcompositor.cpp (+0/-300) |
| To merge this branch: | bzr merge lp://qastaging/~sil2100/nux/revert_640 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity Team | Pending | ||
|
Review via email:
|
|||
Commit message
Reverting revision 640, as it was causing many serious regressions. The direct cause seems to be libgeis, not the nux changes themselves - but this is the easiest way of resolving the problem. This code can be re-added once geis is fixed.
UNBLOCK
Description of the change
Revert of the gesture commit. It causes regressions, so we need to drop it for this release... We'll re-add it once geis is tested and safe again.
To post a comment you must log in.
Revision history for this message
| Łukasz Zemczak (sil2100) wrote | # |
Unmerged revisions
- 646. By Łukasz Zemczak
-
Reverting revision 640, as it was causing many serious regressions. The direct cause seems to be libgeis, not the nux changes themselves - but this is the easiest way of resolving the problem. This code can be re-added once geis is fixed.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
One moment! New facts have come in.