From 88d7d426ca9bb900205a359b80473eb07833f3e3 Mon Sep 17 00:00:00 2001 From: Rafael Caricio Date: Fri, 5 Jun 2020 22:47:13 +0200 Subject: [PATCH] Keep consistent naming with LVGL --- examples/button_click.rs | 4 ++-- lvgl/src/widgets/{button.rs => btn.rs} | 2 +- lvgl/src/widgets/mod.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename lvgl/src/widgets/{button.rs => btn.rs} (62%) diff --git a/examples/button_click.rs b/examples/button_click.rs index 4460d52..8db3074 100644 --- a/examples/button_click.rs +++ b/examples/button_click.rs @@ -4,7 +4,7 @@ use embedded_graphics_simulator::{ OutputSettingsBuilder, SimulatorDisplay, SimulatorEvent, Window, }; use lvgl::style::Style; -use lvgl::widgets::{Button, Label}; +use lvgl::widgets::{Btn, Label}; use lvgl::{self, Align, Color, DisplayDriver, Event, Object, Part, State, UI}; use lvgl_sys; use std::sync::{mpsc, Arc, Mutex}; @@ -34,7 +34,7 @@ fn main() -> Result<(), String> { screen.add_style(Part::Main, screen_style); // Create the button - let mut button = Button::new(&mut screen); + let mut button = Btn::new(&mut screen); button.set_align(&mut screen, Align::InLeftMid, 30, 0); button.set_size(180, 80); let mut btn_lbl = Label::new(&mut button); diff --git a/lvgl/src/widgets/button.rs b/lvgl/src/widgets/btn.rs similarity index 62% rename from lvgl/src/widgets/button.rs rename to lvgl/src/widgets/btn.rs index 464401e..ee6d2db 100644 --- a/lvgl/src/widgets/button.rs +++ b/lvgl/src/widgets/btn.rs @@ -1,4 +1,4 @@ use crate::{GenericObject, NativeObject, Object}; use core::ptr; -define_object!(Button, lv_btn_create); +define_object!(Btn, lv_btn_create); diff --git a/lvgl/src/widgets/mod.rs b/lvgl/src/widgets/mod.rs index b508e52..e0b4182 100644 --- a/lvgl/src/widgets/mod.rs +++ b/lvgl/src/widgets/mod.rs @@ -1,9 +1,9 @@ mod bar; -mod button; +mod btn; mod gauge; mod label; pub use self::bar::*; -pub use self::button::*; +pub use self::btn::*; pub use self::gauge::*; pub use self::label::*;