migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 05:40:03 -04:00
Code Activity

Improve size negotiation code.

Browse Source 
Better enfocred minimum sizes.
You can now have windows that expand to fit their content.
This commit is contained in:
Emil Ernerfeldt
2020-05-01 02:08:01 +02:00
parent 7cd8ac2bbf
commit b73fbb33d8
11 changed files with 332 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
emigui/src/widgets.rs
View File

@@ -21,6 +21,7 @@ pub trait Widget {
pub struct Label {
text: String,
multiline: bool,
text_style: TextStyle, // TODO: Option<TextStyle>, where None means "use the default for the region"
text_color: Option<Color>,
}
@@ -29,11 +30,17 @@ impl Label {
pub fn new(text: impl Into<String>) -> Self {
Label {
text: text.into(),
multiline: true,
text_style: TextStyle::Body,
text_color: None,
}
}
pub fn multiline(mut self, multiline: bool) -> Self {
self.multiline = multiline;
self
}
pub fn text_style(mut self, text_style: TextStyle) -> Self {
self.text_style = text_style;
self
@@ -55,7 +62,11 @@ macro_rules! label {
impl Widget for Label {
fn ui(self, region: &mut Region) -> GuiResponse {
let font = &region.fonts()[self.text_style];
let (text, text_size) = font.layout_multiline(&self.text, region.available_width());
let (text, text_size) = if self.multiline {
font.layout_multiline(&self.text, region.available_width())
} else {
font.layout_single_line(&self.text)
};
let interact = region.reserve_space(text_size, None);
region.add_text(interact.rect.min, self.text_style, text, self.text_color);
region.response(interact)
@@ -423,8 +434,9 @@ impl<'a> Widget for Slider<'a> {
let slider_sans_text = Slider { text: None, ..self };
if text_on_top {
let (text, text_size) = font.layout_multiline(&full_text, region.available_width());
let pos = region.reserve_space_without_padding(text_size);
// let (text, text_size) = font.layout_multiline(&full_text, region.available_width());
let (text, text_size) = font.layout_single_line(&full_text);
let pos = region.reserve_space(text_size, None).rect.min;
region.add_text(pos, text_style, text, text_color);
slider_sans_text.ui(region)
} else {
@@ -437,7 +449,7 @@ impl<'a> Widget for Slider<'a> {
.desired_rect
.set_height(slider_response.rect.height());
columns[1].horizontal(Align::Center, |region| {
region.add(Label::new(full_text));
region.add(Label::new(full_text).multiline(false));
});
slider_response