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

magit merge conflict color seem to be different color compared to vscode #102

Open
wingyplus opened this issue Sep 25, 2020 · 6 comments
Open

Comments

@wingyplus
Copy link

From VSCode, I see merge conflict diss color like this:

Screen Shot 2563-09-25 at 17 56 34

But on Emacs:

Screen Shot 2563-09-25 at 17 55 46

@arcticicestudio
Copy link
Contributor

arcticicestudio commented Sep 26, 2020

Hi @wingyplus 👋, thanks for your contribution 👍

The difference between some ports is often due to the fact that some features are not always part of the application core like in this example Magit which is a third-party package. In #27 the support for Magit was already requested, but there hasn't been a PR. I'm not a Emcas user myself and since my free time I can spend on open source is limited and there are hundreds of other tasks the request is still pending.
Feel free to submit a PR to implement the required style faces, every contribution is always welcome 😊


Related to or duplicate of #27

@wingyplus
Copy link
Author

@arcticicestudio Thanks for your reply. I'll take a look what I can do with this. :)

@wingyplus wingyplus changed the title magit merge coflict color seem to be different color compared to vscode magit merge conflict color seem to be different color compared to vscode Sep 28, 2020
@wingyplus
Copy link
Author

I just update on my research. It seems we need to decorate smerge theme. In the image below, I custom smerge-refined-added to use nord7. It's works but the color look hard to read.

Screen Shot 2563-10-03 at 20 44 24

@wingyplus
Copy link
Author

Add 3 lines for smerge to the same diff looks better.

    ;; > smerge
    `(smerge-refined-added ((,class (:foreground ,nord14))))
    `(smerge-refined-changed ((,class (:foreground ,nord13))))
    `(smerge-refined-removed ((,class (:foreground ,nord11))))

Screen Shot 2563-10-03 at 21 22 07

@wingyplus
Copy link
Author

Compare to diff in magit-show-commit. The result from previous comment looks very weired. 🤔

Screen Shot 2563-10-03 at 21 24 41

@arcticicestudio
Copy link
Contributor

In order to achieve the same style like in VS Code, the background color must be "semi-transparent" by making use of the alpha layer value, but I'm not sure if it is supported by Emacs. We need to add new color variables which use the RGBA color model.

@arcticicestudio arcticicestudio removed the Hacktoberfest This repository participates in the Hacktoberfest label Nov 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants