Merge lp://staging/~alan-griffiths/miral/1.3 into lp://staging/miral/release
Proposed by
Alan Griffiths
Status: | Merged |
---|---|
Approved by: | Alan Griffiths |
Approved revision: | no longer in the source branch. |
Merged at revision: | 359 |
Proposed branch: | lp://staging/~alan-griffiths/miral/1.3 |
Merge into: | lp://staging/miral/release |
Diff against target: |
453 lines (+124/-28) 17 files modified
CMakeLists.txt (+1/-1) debian/changelog (+19/-0) include/miral/set_window_management_policy.h (+3/-3) miral-kiosk/kiosk_main.cpp (+1/-1) miral-shell/decoration_provider.cpp (+12/-1) miral-shell/miral-app.sh (+2/-4) miral-shell/miral-desktop.sh (+1/-1) miral-shell/miral-run.sh (+1/-1) miral-shell/miral-xrun.sh (+21/-1) miral-shell/titlebar_window_manager.cpp (+4/-0) miral/CMakeLists.txt (+1/-1) miral/basic_window_manager.cpp (+10/-0) miral/basic_window_manager.h (+9/-1) miral/set_window_management_policy.cpp (+5/-5) test/test_server.cpp (+1/-1) test/test_window_manager_tools.h (+7/-0) test/workspaces.cpp (+26/-7) |
To merge this branch: | bzr merge lp://staging/~alan-griffiths/miral/1.3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Griffiths | Approve | ||
Review via email:
|
Commit message
1.3.1 release
To post a comment you must log in.
Seen this twice in bileto:
[ RUN ] Workspaces. with_two_ applications_ when_a_ window_ in_a_workspace_ hides_focus_ remains_ in_workspace >/miral- 1.3.2+16. 04.20170330/ test/workspaces .cpp:534: Failure window( ) window( ): a window window( dialog) : dialog
[2017-03-30 07:31:06.592649] mirserver: Starting
[2017-03-30 07:31:06.592873] mirserver: Selected driver: mir:stub-graphics (version 0.26.2)
[2017-03-30 07:31:06.593742] mirserver: Using software cursor
[2017-03-30 07:31:06.624258] mirserver: Selected input driver: mir:stub-input (version: 0.26.2)
[2017-03-30 07:31:06.634376] mirserver: Mir version 0.26.2
[2017-03-30 07:31:06.638238] mirserver: Initial display configuration:
[2017-03-30 07:31:06.651197] mirserver: Output 1: VGA connected, used
[2017-03-30 07:31:06.651288] mirserver: Physical size 0.0" 0x0mm
[2017-03-30 07:31:06.651306] mirserver: Power is on
[2017-03-30 07:31:06.651328] mirserver: Current mode 1600x1600 60.00Hz
[2017-03-30 07:31:06.651346] mirserver: Preferred mode 1600x1600 60.00Hz
[2017-03-30 07:31:06.651362] mirserver: Orientation normal
[2017-03-30 07:31:06.651379] mirserver: Logical size 1600x1600
[2017-03-30 07:31:06.651394] mirserver: Logical position +0+0
/<<BUILDDIR>
Value of: tools.active_
Expected: is equal to 1
Actual: 1 (of type miral::Window)
tools.active_
server_
GMOCK WARNING: focus_gained( @0x7f80003200 8-byte object <80-4A 00-80 7F-00 00-00>)
Uninteresting mock function call - returning directly.
Function call: advise_
Stack trace:
GMOCK WARNING: removing_ from_workspace( @0x7f8000ac30 16-byte object <50-6A 9F-0D 00-00 00-00 40-6A 9F-0D 00-00 00-00>, @0x7f977fd800 { 1 })
Uninteresting mock function call - returning directly.
Function call: advise_
Stack trace:
GMOCK WARNING: focus_gained( @0x7f80007940 8-byte object <50-8A 00-80 7F-00 00-00>) with_two_ applications_ when_a_ window_ in_a_workspace_ hides_focus_ remains_ in_workspace (344 ms)
Uninteresting mock function call - returning directly.
Function call: advise_
Stack trace:
[2017-03-30 07:31:06.925379] mirserver: Stopping
[ FAILED ] Workspaces.