mirror of
https://github.com/emilk/egui.git
synced 2026-09-02 23:00:04 -04:00
bcd91f27a1
* Closes #4473 This PR introduce `Style::wrap_mode`, which adds support for text truncation in addition to text wrapping. This PR also update some width calculation of the ComboBox. #### Core - Add `egui::TextWrapMode` (pure enum with `Extend`, `Wrap`, `Truncate`) - Add `Style::wrap_mode: Option<tTextWrapMode>` - **DEPRECATED**: `Style::wrap`, use `Style::wrap_mode` instead. - Add `Ui::wrap_mode()` to return the wrap mode to use in the current ui. If specified in `Style`, return it. Otherwise, return `TextWrapMode::Wrap` for vertical layout and wrapping horizontal layout, and `TextWrapMode::Extend` otherwise. - **DEPRECATED**: `Ui::wrap_text()`, use `Ui::wrap_mode` instead. #### Widget - Update the width calculation of the `ComboBox` button (_not_ its popup menu). - Now, `ComboBox::width()` (defaulting to `Spacing::combo_width`) is always considered a minimum width and will extend the `Ui`, regardless of the selected text width and wrap mode. - Introduce `ComboBox::wrap_mode`, which overrides `Ui::wrap_mode` for the selected text layout. - Note: since `ComboBox` uses `ui.horizontal` internally, the default wrap mode is always `TextWrapMode::Extend`, regardless of the caller's `Ui`'s layout. - The `ComboBox` button no longer extend to `ui.available_width()` with wrapping is enabled. - **BREAKING**: `ComboBox::wrap()` no longer has a `bool` argument and is now a short-hand for `ComboBox::wrap_mode(TextWrapMode::Wrap)`. - Added `ComboBox::truncate()` as short-hand for `ComboBox::wrap_mode(TextWrapMode::Truncate)`. - Update `Label` - Add `Label::wrap_mode()` to specify the text wrap mode. - **BREAKING**: `Label::wrap()` no longer has a `bool` argument and is now a short-hand for `Label::wrap_mode(TextWrapMode::Wrap)`. - **BREAKING**: `Label::truncate()` no longer has a `bool` argument and is now a short-hand for `Label::wrap_mode(TextWrapMode::Truncate)`. - Update `Button` - Add `Button::wrap_mode()` to specify the text wrap mode. - **BREAKING**: `Button::wrap()` no longer has a `bool` argument and is now a short-hand for `Button::wrap_mode(TextWrapMode::Wrap)`. - Added `Button::truncate()` as short-hand for `Button::wrap_mode(TextWrapMode::Truncate)`. #### Low-level - **BREAKING**: `WidgetText::into_galley()` now takes an `Option<TextWrapMode>` instead of a `Option<bool>` argument. - **BREAKING**: `WidgetText::into_galley_impl(()` now takes a `TextWrapping` argument instead of `wrap: bool` and `availalbe_width: f32` arguments. --------- Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
75 lines
2.3 KiB
Rust
75 lines
2.3 KiB
Rust
/// Shows off a table with dynamic layout
|
|
#[derive(PartialEq)]
|
|
pub struct FrameDemo {
|
|
frame: egui::Frame,
|
|
}
|
|
|
|
impl Default for FrameDemo {
|
|
fn default() -> Self {
|
|
Self {
|
|
frame: egui::Frame {
|
|
inner_margin: 12.0.into(),
|
|
outer_margin: 24.0.into(),
|
|
rounding: 14.0.into(),
|
|
shadow: egui::Shadow {
|
|
offset: [8.0, 12.0].into(),
|
|
blur: 16.0,
|
|
spread: 0.0,
|
|
color: egui::Color32::from_black_alpha(180),
|
|
},
|
|
fill: egui::Color32::from_rgba_unmultiplied(97, 0, 255, 128),
|
|
stroke: egui::Stroke::new(1.0, egui::Color32::GRAY),
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
impl super::Demo for FrameDemo {
|
|
fn name(&self) -> &'static str {
|
|
"▣ Frame"
|
|
}
|
|
|
|
fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
|
|
egui::Window::new(self.name())
|
|
.open(open)
|
|
.resizable(false)
|
|
.show(ctx, |ui| {
|
|
use super::View as _;
|
|
self.ui(ui);
|
|
});
|
|
}
|
|
}
|
|
|
|
impl super::View for FrameDemo {
|
|
fn ui(&mut self, ui: &mut egui::Ui) {
|
|
ui.horizontal(|ui| {
|
|
ui.vertical(|ui| {
|
|
ui.add(&mut self.frame);
|
|
|
|
ui.add_space(8.0);
|
|
ui.set_max_width(ui.min_size().x);
|
|
ui.vertical_centered(|ui| egui::reset_button(ui, self, "Reset"));
|
|
});
|
|
|
|
ui.separator();
|
|
|
|
ui.vertical(|ui| {
|
|
// We want to paint a background around the outer margin of the demonstration frame, so we use another frame around it:
|
|
egui::Frame::default()
|
|
.stroke(ui.visuals().widgets.noninteractive.bg_stroke)
|
|
.rounding(ui.visuals().widgets.noninteractive.rounding)
|
|
.show(ui, |ui| {
|
|
self.frame.show(ui, |ui| {
|
|
ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
|
|
ui.label(egui::RichText::new("Content").color(egui::Color32::WHITE));
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
ui.set_max_width(ui.min_size().x);
|
|
ui.separator();
|
|
ui.vertical_centered(|ui| ui.add(crate::egui_github_link_file!()));
|
|
}
|
|
}
|