Merged
Conversation
When a toolbar popup (e.g. the transparency gradient popover) is closed, closeDropdown sends a closemenu callback referencing the parent toolbox via parentContainer.id. If the sidebar DOM has been rebuilt between popup open and close, the captured parentContainer element can become stale with an empty id, causing an assert(false) in lcl_sendDialogEvent. Capture the parent id as a string at closure creation time so it remains stable regardless of DOM lifecycle. Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b
When a toolbar button has an "icon" field, setImage() tries to load it as a local SVG. If the SVG does not exist, LOUtil.checkIfImageExists() hides the <img> element with display:none. The onerror fallback then sets the src to the base64 PNG from the "image" field, but the image stays invisible because display:none was already applied. Restore display when substituting the fallback PNG so toolbar buttons remain visible even without a local SVG icon. Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1
Copy the 45-degree rotate-left and rotate-right icons from the colibre_svg theme (light and dark variants) so the toolbar buttons in the Floating Area Style popup render crisp SVGs instead of falling back to base64 PNGs. Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2
eszkadev
approved these changes
Apr 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requires: https://gerrit.collaboraoffice.com/c/core/+/374 jsdialog: fix toolbar popup serialization going one level too deep
Before:
After:
