djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename Widget::add_to to Widget::ui

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-04-29 22:01:39 +02:00
parent bf59455097
commit 7cd8ac2bbf
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emigui/src/region.rs
View file

@ -371,7 +371,7 @@ impl Region {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
pub fn add(&mut self, widget: impl Widget) -> GuiResponse { pub fn add(&mut self, widget: impl Widget) -> GuiResponse {
widget.add_to(self) widget.ui(self)
} }
// Convenience functions: // Convenience functions:

19
emigui/src/widgets.rs
View file

@ -14,8 +14,7 @@ pub use text_edit::*;
/// Anything implementing Widget can be added to a Region with Region::add /// Anything implementing Widget can be added to a Region with Region::add
pub trait Widget { pub trait Widget {
// TODO: rename .ui( fn ui(self, region: &mut Region) -> GuiResponse;
fn add_to(self, region: &mut Region) -> GuiResponse;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -54,7 +53,7 @@ macro_rules! label {
} }
impl Widget for Label { impl Widget for Label {
fn add_to(self, region: &mut Region) -> GuiResponse { fn ui(self, region: &mut Region) -> GuiResponse {
let font = &region.fonts()[self.text_style]; let font = &region.fonts()[self.text_style];
let (text, text_size) = font.layout_multiline(&self.text, region.available_width()); let (text, text_size) = font.layout_multiline(&self.text, region.available_width());
let interact = region.reserve_space(text_size, None); let interact = region.reserve_space(text_size, None);
@ -81,7 +80,7 @@ impl Hyperlink {
} }
impl Widget for Hyperlink { impl Widget for Hyperlink {
fn add_to(self, region: &mut Region) -> GuiResponse { fn ui(self, region: &mut Region) -> GuiResponse {
let color = color::LIGHT_BLUE; let color = color::LIGHT_BLUE;
let text_style = TextStyle::Body; let text_style = TextStyle::Body;
let id = region.make_child_id(&self.url); let id = region.make_child_id(&self.url);
@ -141,7 +140,7 @@ impl Button {
} }
impl Widget for Button { impl Widget for Button {
fn add_to(self, region: &mut Region) -> GuiResponse { fn ui(self, region: &mut Region) -> GuiResponse {
let id = region.make_position_id(); let id = region.make_position_id();
let text_style = TextStyle::Button; let text_style = TextStyle::Button;
let font = &region.fonts()[text_style]; let font = &region.fonts()[text_style];
@ -190,7 +189,7 @@ impl<'a> Checkbox<'a> {
} }
impl<'a> Widget for Checkbox<'a> { impl<'a> Widget for Checkbox<'a> {
fn add_to(self, region: &mut Region) -> GuiResponse { fn ui(self, region: &mut Region) -> GuiResponse {
let id = region.make_position_id(); let id = region.make_position_id();
let text_style = TextStyle::Button; let text_style = TextStyle::Button;
let font = &region.fonts()[text_style]; let font = &region.fonts()[text_style];
@ -265,7 +264,7 @@ pub fn radio(checked: bool, text: impl Into<String>) -> RadioButton {
} }
impl Widget for RadioButton { impl Widget for RadioButton {
fn add_to(self, region: &mut Region) -> GuiResponse { fn ui(self, region: &mut Region) -> GuiResponse {
let id = region.make_position_id(); let id = region.make_position_id();
let text_style = TextStyle::Button; let text_style = TextStyle::Button;
let font = &region.fonts()[text_style]; let font = &region.fonts()[text_style];
@ -407,7 +406,7 @@ impl<'a> Slider<'a> {
} }
impl<'a> Widget for Slider<'a> { impl<'a> Widget for Slider<'a> {
fn add_to(mut self, region: &mut Region) -> GuiResponse { fn ui(mut self, region: &mut Region) -> GuiResponse {
let text_style = TextStyle::Button; let text_style = TextStyle::Button;
let font = &region.fonts()[text_style]; let font = &region.fonts()[text_style];
@ -427,7 +426,7 @@ impl<'a> Widget for Slider<'a> {
let (text, text_size) = font.layout_multiline(&full_text, region.available_width()); let (text, text_size) = font.layout_multiline(&full_text, region.available_width());
let pos = region.reserve_space_without_padding(text_size); let pos = region.reserve_space_without_padding(text_size);
region.add_text(pos, text_style, text, text_color); region.add_text(pos, text_style, text, text_color);
slider_sans_text.add_to(region) slider_sans_text.ui(region)
} else { } else {
region.columns(2, |columns| { region.columns(2, |columns| {
// Slider on the left: // Slider on the left:
@ -547,7 +546,7 @@ impl Separator {
} }
impl Widget for Separator { impl Widget for Separator {
fn add_to(self, region: &mut Region) -> GuiResponse { fn ui(self, region: &mut Region) -> GuiResponse {
let available_space = region.available_space(); let available_space = region.available_space();
let extra = self.extra; let extra = self.extra;
let (points, interact) = match region.direction() { let (points, interact) = match region.direction() {

2
emigui/src/widgets/text_edit.rs
View file

@ -35,7 +35,7 @@ impl<'t> TextEdit<'t> {
} }
impl<'t> Widget for TextEdit<'t> { impl<'t> Widget for TextEdit<'t> {
fn add_to(self, region: &mut Region) -> GuiResponse { fn ui(self, region: &mut Region) -> GuiResponse {
let id = region.make_child_id(self.id); let id = region.make_child_id(self.id);
let font = &region.fonts()[self.text_style]; let font = &region.fonts()[self.text_style];