lp://qastaging/~unity-team/unity/fix-lp1309778-trusty

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://qastaging/unity/7.2

PS Jenkins bot (community): Approve (continuous-integration) on 2015-07-15

Unity Team: Pending requested 2015-07-15

Diff: 5329 lines (+1369/-784)

71 files modified

UnityCore/AppmenuIndicator.cpp (+52/-12)
UnityCore/AppmenuIndicator.h (+4/-3)
UnityCore/CMakeLists.txt (+1/-0)
UnityCore/DBusIndicators.cpp (+52/-40)
UnityCore/GLibDBusServer.cpp (+3/-2)
UnityCore/GLibSource.h (+2/-2)
UnityCore/Indicator.cpp (+15/-30)
UnityCore/Indicator.h (+3/-4)
UnityCore/IndicatorEntry.cpp (+15/-5)
UnityCore/IndicatorEntry.h (+4/-1)
UnityCore/Indicators.cpp (+2/-1)
UnityCore/pch/unitycore_pch.hh (+1/-0)
com.canonical.Unity.gschema.xml (+6/-0)
dash/DashView.h (+1/-1)
dash/ScopeView.h (+2/-1)
debian/control (+1/-1)
decorations/DecoratedWindow.cpp (+13/-9)
decorations/DecorationsManager.cpp (+12/-15)
decorations/DecorationsMenuDropdown.cpp (+4/-3)
decorations/DecorationsMenuEntry.cpp (+12/-2)
decorations/DecorationsMenuEntry.h (+2/-1)
decorations/DecorationsMenuLayout.cpp (+25/-3)
decorations/DecorationsPriv.h (+3/-1)
decorations/DecorationsSlidingLayout.cpp (+1/-1)
decorations/DecorationsWidgets.cpp (+4/-9)
launcher/LauncherEntryRemoteModel.h (+2/-2)
launcher/XdndStartStopNotifierImp.h (+1/-1)
lockscreen/LockScreenPanel.cpp (+1/-1)
panel/PanelIndicatorEntryDropdownView.cpp (+6/-1)
panel/PanelIndicatorEntryDropdownView.h (+1/-0)
panel/PanelIndicatorEntryView.cpp (+7/-5)
panel/PanelIndicatorEntryView.h (+2/-3)
panel/PanelIndicatorsView.cpp (+43/-13)
panel/PanelIndicatorsView.h (+6/-4)
panel/PanelMenuView.cpp (+140/-112)
panel/PanelMenuView.h (+8/-4)
panel/PanelView.cpp (+3/-3)
plugins/unityshell/src/unityshell.cpp (+34/-44)
plugins/unityshell/src/unityshell.h (+2/-1)
services/panel-main.c (+20/-20)
services/panel-service-private.h (+22/-3)
services/panel-service.c (+148/-60)
services/panel-service.h (+0/-8)
shortcuts/ShortcutModel.h (+3/-3)
tests/autopilot/unity/emulators/panel.py (+4/-0)
tests/autopilot/unity/tests/__init__.py (+12/-13)
tests/autopilot/unity/tests/test_dash.py (+2/-2)
tests/autopilot/unity/tests/test_hud.py (+2/-2)
tests/autopilot/unity/tests/test_panel.py (+258/-211)
tests/autopilot/unity/tests/test_wm_keybindings.py (+1/-6)
tests/mock-application.h (+2/-2)
tests/test_dbus_indicators.cpp (+3/-4)
tests/test_indicator.cpp (+18/-21)
tests/test_indicator_appmenu.cpp (+182/-21)
tests/test_indicator_entry.cpp (+17/-14)
tests/test_indicators.cpp (+11/-11)
tests/test_panel_menu_view.cpp (+19/-3)
tests/test_panel_service.cpp (+6/-2)
tests/test_service_panel.cpp (+18/-15)
unity-shared/IconLoader.cpp (+2/-2)
unity-shared/MenuManager.cpp (+63/-8)
unity-shared/NuxObjectPtrHash.h (+36/-0)
unity-shared/PlacesVScrollBar.cpp (+1/-1)
unity-shared/PluginAdapter.cpp (+11/-2)
unity-shared/PluginAdapter.h (+2/-2)
unity-shared/PreviewStyle.cpp (+1/-1)
unity-shared/StandaloneWindowManager.cpp (+1/-0)
unity-shared/UBusWrapper.cpp (+3/-4)
unity-shared/UBusWrapper.h (+2/-2)
unity-shared/UnitySettings.cpp (+2/-0)
unity-shared/UnitySettings.h (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1309778: LIM only on focused window => no advantage over global menu

Medium

Fix Released

Link a bug report

Related blueprints

3833. By Christopher Townsend on 2015-07-15

Merge lp:unity/7.2.

3832. By Marco Trevisan (Treviño) on 2015-05-28

Decorations, Panel: add menus for unfocused windows as well

Now the indicator-appmenu exports the menus for all the windows,
then it's up to us to filter them based on their parent window and
show on relevant place.

3831. By Marco Trevisan (Treviño) on 2015-05-28

UScreen, PanelService: get monitor at position, ignoring pre-multipled Gdk scale factor

Get monitor position based on absolute coordinates, ignoring the pre-multipled
scaling factor that Gdk applies to all the monitor sizes.

In this way we get the proper monitor index for absolute coordinates,
independently from the scaling factor.

3830. By CI Train Bot Account on 2015-05-21

Releasing 7.2.5+14.04.20150521.1-0ubuntu1

3829. By Stephen M. Webb on 2015-05-21

AP tests: accounted for arbitrarily-raised exceptions in checking scaled windows Fixes: #1436095
Approved by: Stephen M. Webb, PS Jenkins bot

3828. By Andrea Azzarone on 2015-05-21

Forward first key event that happens on top of the blank window to the lockscreen. Fixes: #1308265
Approved by: Stephen M. Webb, PS Jenkins bot

3827. By Andrea Azzarone on 2015-05-21

Release pointer barrier if launcher is in lock_hide state. Fixes: #1029114
Approved by: Stephen M. Webb, PS Jenkins bot

3826. By Andrea Azzarone on 2015-05-21

Make sure scope_views_[filter.id] exists before using operator[] on it. Fixes: #926979
Approved by: Stephen M. Webb, PS Jenkins bot

3825. By Andrea Azzarone on 2015-05-21

Do not restore focus if a quicklist is opened during launcher key navigation. Fixes: #932486
Approved by: Stephen M. Webb, PS Jenkins bot

3824. By Brandon Schaefer on 2015-05-21

When we quit the quicklist it would check if the mouse was over the launcher, if it wasn't it would fold the launcher. We don't need to check this if we are in keynav as we want all the icons to be unfolded. Fixes: #1246891
Approved by: Stephen M. Webb, PS Jenkins bot