feat: use height of text as button height in context menu #254
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
|
@andymandias do you mind testing this if context menus works on linux? |
|
Confirmed on IRC but will also confirm here for posterity, it works perfectly. Thank you! |
tarkah
reviewed
Mar 7, 2024
Comment on lines
+63
to
+94
| pub family: String, | ||
| pub size: f32, | ||
| } | ||
|
|
||
| impl Default for Font { | ||
| fn default() -> Self { | ||
| Self { | ||
| family: String::from("Iosevka Term"), | ||
| size: 13.0 | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Font { | ||
| fn deserialize<'de, D>(deserializer: D) -> Result<Self, D::Error> | ||
| where | ||
| D: Deserializer<'de>, | ||
| { | ||
| #[derive(Deserialize)] | ||
| struct MaybeFont { | ||
| family: Option<String>, | ||
| size: Option<f32>, | ||
| } | ||
|
|
||
| let MaybeFont { family, size } = MaybeFont::deserialize(deserializer)?; | ||
| let Font { family: default_family, size: default_size } = Font::default(); | ||
|
|
||
| Ok(Font { | ||
| family: family.unwrap_or(default_family), | ||
| size: size.unwrap_or(default_size), | ||
| }) | ||
| } |
There was a problem hiding this comment.
#[serde(default_with = "default_font_size")]
fn default_font_size() -> f32 {
13.0
}There was a problem hiding this comment.
Then you can keep default below on Font
Comment on lines
+249
to
+254
| // Height based on font size, with some margin added. | ||
| let height = LineHeight::default().to_absolute((font.size + 8.0).into()); | ||
|
|
||
| button(text(content).style(theme::Text::Primary)) | ||
| .width(length) | ||
| .height(length) | ||
| .height(height) |
There was a problem hiding this comment.
This seems super hacky. Let me play around. We should just be able to use Shrink height and have it work when font size increases....
|
Supeceded by #255 |
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.
WIP to fix #238