Merge lp://qastaging/~jaytaoko/nux/nux-windowthread-cleanup1 into lp://qastaging/nux/2.0
Proposed by
Jay Taoko
| Status: | Merged |
|---|---|
| Approved by: | Jay Taoko |
| Approved revision: | 531 |
| Merged at revision: | 531 |
| Proposed branch: | lp://qastaging/~jaytaoko/nux/nux-windowthread-cleanup1 |
| Merge into: | lp://qastaging/nux/2.0 |
| Diff against target: |
5259 lines (+1856/-1541) 36 files modified
Nux/AbstractThread.cpp (+47/-4) Nux/AbstractThread.h (+15/-14) Nux/Area.cpp (+5/-5) Nux/ClientArea.cpp (+3/-3) Nux/ColorEditor.cpp (+1/-1) Nux/MainLoopGLib.cpp (+390/-0) Nux/Makefile.am (+1/-0) Nux/Nux.cpp (+201/-144) Nux/Nux.h (+139/-45) Nux/Painter.cpp (+2/-1) Nux/Painter.h (+3/-1) Nux/SystemThread.cpp (+30/-30) Nux/SystemThread.h (+6/-12) Nux/TimerProc.cpp (+2/-1) Nux/TimerProc.h (+6/-2) Nux/WindowCompositor.cpp (+3/-32) Nux/WindowCompositor.h (+3/-4) Nux/WindowThread.cpp (+412/-808) Nux/WindowThread.h (+408/-344) NuxCore/NuxCore.h (+9/-9) NuxCore/ThreadGNU.cpp (+21/-4) NuxCore/ThreadGNU.h (+30/-5) NuxCore/ThreadWin.cpp (+53/-27) NuxCore/ThreadWin.h (+48/-22) NuxGraphics/GraphicsDisplayX11.cpp (+5/-2) configure.ac (+1/-1) tests/button-xtest.cpp (+2/-10) tests/hgrid-key-navigation-test.cpp (+1/-1) tests/hlayout-key-navigation-test.cpp (+1/-1) tests/mouse-buttons-test.cpp (+1/-1) tests/mouse-events-test.cpp (+1/-1) tests/nux_test_framework.cpp (+1/-1) tests/scrollbar-test.cpp (+1/-1) tests/test_cairo_wrapper.cpp (+1/-1) tests/test_empty_window.cpp (+2/-2) tests/vlayout-key-navigation-test.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~jaytaoko/nux/nux-windowthread-cleanup1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jason Smith (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Added separate file for GLib main loop functions
* Cleanup: variable renaming
* Marked some functions as obsolete
* Core objects take the WindowThread as a constructor parameters: Painter, WindowCompositor...
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
works fine with related unity branches