https://bugs.kde.org/show_bug.cgi?id=64754
David Faure <fa...@kde.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Version Fixed In| |5.24 Status|CONFIRMED |RESOLVED Latest Commit| |http://commits.kde.org/kxml | |gui/cfb9d1923b1376153760519 | |edf4760248176c7c8 --- Comment #49 from David Faure <fa...@kde.org> --- Git commit cfb9d1923b1376153760519edf4760248176c7c8 by David Faure. Committed on 17/06/2016 at 08:49. Pushed by dfaure into branch 'master'. 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]. 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 M +73 -45 autotests/kxmlgui_unittest.cpp M +3 -1 src/kxmlguibuilder.h M +2 -12 src/kxmlguifactory.cpp M +46 -69 src/kxmlguifactory_p.cpp M +3 -3 src/kxmlguifactory_p.h http://commits.kde.org/kxmlgui/cfb9d1923b1376153760519edf4760248176c7c8 -- You are receiving this mail because: You are watching all bug changes.