-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
Use Style's font size in egui_extras::syntax_highlighting #5090
Merged
Conversation
This file contains 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
lampsitter
force-pushed
the
font-size-hardcoding
branch
2 times, most recently
from
September 8, 2024 11:02
97e6a54
to
4b5ba62
Compare
lampsitter
force-pushed
the
font-size-hardcoding
branch
from
September 8, 2024 11:06
4b5ba62
to
85e1b14
Compare
lampsitter
commented
Sep 8, 2024
/// let theme = CodeTheme::dark(12.0); | ||
/// # }); | ||
/// ``` | ||
pub fn dark(font_size: f32) -> Self { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added doc example to ease the impact of the breaking change
emilk
approved these changes
Sep 10, 2024
hacknus
pushed a commit
to hacknus/egui
that referenced
this pull request
Oct 30, 2024
<!-- Please read the "Making a PR" section of [`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md) before opening a Pull Request! * Keep your PR:s small and focused. * The PR title is what ends up in the changelog, so make it descriptive! * If applicable, add a screenshot or gif. * If it is a non-trivial addition, consider adding a demo for it to `egui_demo_lib`, or a new example. * Do NOT open PR:s from your `master` branch, as that makes it hard for maintainers to test and add commits to your PR. * Remember to run `cargo fmt` and `cargo clippy`. * Open the PR as a draft until you have self-reviewed it and run `./scripts/check.sh`. * When you have addressed a PR comment, mark it as resolved. Please be patient! I will review your PR, but my time is limited! --> * Closes emilk#3549 * [X] I have followed the instructions in the PR template The syntax highlighting font size was always hardcoded to 12 or 10 depending on what case it was hitting (so not consistent). This is particularly noticeable when you increase the font size to something larger for the rest of the ui. With this the default monospace font size is used by default. Since the issue is closely related to emilk#3549 I decided to implement the ability to use override_font_id too. ## Visualized Default monospace is set to 15 in all the pictures Before/After without syntect: ![normal](https://github.com/user-attachments/assets/0d058720-47ff-49e7-af77-30d48f5e138c) Before/after _with_ syntect: ![syntect](https://github.com/user-attachments/assets/e5c380fe-ced1-40ee-b4b1-c26cec18a840) Font override after without/with syntect (monospace = 20): ![override](https://github.com/user-attachments/assets/efd1b759-3f97-4673-864a-5a18afc64099) ### Breaking changes - `CodeTheme::dark` and `CodeTheme::light` takes in the font size - `CodeTheme::from_memory` takes in `Style` - `highlight` function takes in `Style`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The syntax highlighting font size was always hardcoded to 12 or 10 depending on what case it was hitting (so not consistent). This is particularly noticeable when you increase the font size to something larger for the rest of the ui.
With this the default monospace font size is used by default.
Since the issue is closely related to #3549 I decided to implement the ability to use override_font_id too.
Visualized
Default monospace is set to 15 in all the pictures
Before/After without syntect:
Before/after with syntect:
Font override after without/with syntect (monospace = 20):
Breaking changes
CodeTheme::dark
andCodeTheme::light
takes in the font sizeCodeTheme::from_memory
takes inStyle
highlight
function takes inStyle