Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitChangebar: disable Scintilla's Change History in diff tooltip #1281

Merged
merged 1 commit into from
Oct 13, 2023

Conversation

eht16
Copy link
Member

@eht16 eht16 commented Oct 13, 2023

If the "Change history" feature is enabled in Geany, it might lead to styling issues in the tooltip displaying the diff of the current hunk. So always disable this feature for the tooltip where it is not needed.

I don't think we ever need the "Change history" in the diff tooltip, as the tooltip itself is already the improved version of the change history :).

gcb_200
This happens when the "Change history" feature is enabled in Geany, so it gets also enabled in the Scintilla widget for the tooltip where we don't need it.
For some reason, by setting the margin widths to 0 in https://github.com/geany/geany-plugins/blob/master/git-changebar/src/gcb-plugin.c#L840 the background colors in the Scintilla widget are reset to white (or something else happens with a similar result, I don't understand completely the relation between the margin visibility and the line background color).
Anyway, disable change history prevents this issue.

If the "Change history" feature is enabled in Geany, it might
lead to styling issues in the tooltip displaying the diff
of the current hunk. So always disable this feature for
the tooltip where it is not needed.
@eht16 eht16 requested a review from b4n October 13, 2023 14:35
@b4n b4n merged commit abb1294 into geany:master Oct 13, 2023
2 checks passed
@b4n
Copy link
Member

b4n commented Oct 13, 2023

Thanks! I didn't see it behave so badly as your screenshot, but it also looks weird if the inline option is enabled, so disabling it altogether in the popup seems the way to go -- and no, we don't need it anyway :)

@b4n b4n added this to the 1.39.0/2.0.0 milestone Oct 13, 2023
@eht16 eht16 deleted the gitchangebar_disable_changehistory branch October 14, 2023 08:40
@eht16
Copy link
Member Author

eht16 commented Oct 14, 2023

FTR: the used theme on the screenshot is Inkpot.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants