KXMLGui: Fix merge indices when removing xmlgui clients with actions in groups.
Summary: The code was assuming that all actions from the client being removed were together in one merge point, but the group feature (added slightly later) changed that. Indices therefore have to be adjusted after each action removal. While extending the unittest to check this for dynamic actionlists, I found another bug in the updating of merging indices: when a client inserts an actionlist element (or possibly a group element for child-child-clients) and then N more actions, the actionlist would go down N times. Fixed by comparing clientNames, i.e. only merge points from other clients should go down while inserting actions, nor our own [except in plugActionList]. BUG: 64754 FIXED-IN: 5.24 Test Plan: Editing toolbars in kate to add actions (without group) to the katepart toolbar, would lead to incoherent moving of toolbar buttons at every document switch. This commit fixes that. Reviewers: svuorela, dhaumann Reviewed By: dhaumann Subscribers: kde-frameworks-devel Differential Revision: https://phabricator.kde.org/D1924
parent
af7aab93
Please register or sign in to comment