Skip to content

Commit 78dfde4

Browse files
committed
Remove deprecated functions
1 parent b551dfe commit 78dfde4

File tree

8 files changed

+0
-80
lines changed

8 files changed

+0
-80
lines changed

egui/src/containers/scroll_area.rs

-12
Original file line numberDiff line numberDiff line change
@@ -114,18 +114,6 @@ impl ScrollArea {
114114
}
115115
}
116116

117-
/// Will make the area be as high as it is allowed to be (i.e. fill the [`Ui`] it is in)
118-
#[deprecated = "Use pub ScrollArea::vertical() instead"]
119-
pub fn auto_sized() -> Self {
120-
Self::vertical()
121-
}
122-
123-
/// Use `f32::INFINITY` if you want the scroll area to expand to fit the surrounding Ui
124-
#[deprecated = "Use pub ScrollArea::vertical().max_height(…) instead"]
125-
pub fn from_max_height(max_height: f32) -> Self {
126-
Self::vertical().max_height(max_height)
127-
}
128-
129117
/// The maximum width of the outer frame of the scroll area.
130118
///
131119
/// Use `f32::INFINITY` if you want the scroll area to expand to fit the surrounding `Ui` (default).

egui/src/containers/window.rs

-5
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,6 @@ impl<'open> Window<'open> {
225225
self
226226
}
227227

228-
#[deprecated = "Use .vscroll(…) instead"]
229-
pub fn scroll(self, scroll: bool) -> Self {
230-
self.vscroll(scroll)
231-
}
232-
233228
/// Constrain the area up to which the window can be dragged.
234229
pub fn drag_bounds(mut self, bounds: Rect) -> Self {
235230
self.area = self.area.drag_bounds(bounds);

egui/src/ui.rs

-20
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,6 @@ impl Ui {
218218
self.enabled
219219
}
220220

221-
#[deprecated = "Renamed to is_enabled"]
222-
pub fn enabled(&self) -> bool {
223-
self.enabled
224-
}
225-
226221
/// Calling `set_enabled(false)` will cause the `Ui` to deny all future interaction
227222
/// and all the widgets will draw with a gray look.
228223
///
@@ -381,11 +376,6 @@ impl Ui {
381376
self.placer.max_rect()
382377
}
383378

384-
#[deprecated = "Use .max_rect() instead"]
385-
pub fn max_rect_finite(&self) -> Rect {
386-
self.max_rect()
387-
}
388-
389379
/// Used for animation, kind of hacky
390380
pub(crate) fn force_set_min_rect(&mut self, min_rect: Rect) {
391381
self.placer.force_set_min_rect(min_rect);
@@ -514,19 +504,9 @@ impl Ui {
514504
self.placer.available_rect_before_wrap().size()
515505
}
516506

517-
#[deprecated = "Use .available_size_before_wrap() instead"]
518-
pub fn available_size_before_wrap_finite(&self) -> Vec2 {
519-
self.available_size_before_wrap()
520-
}
521-
522507
pub fn available_rect_before_wrap(&self) -> Rect {
523508
self.placer.available_rect_before_wrap()
524509
}
525-
526-
#[deprecated = "Use .available_rect_before_wrap() instead"]
527-
pub fn available_rect_before_wrap_finite(&self) -> Rect {
528-
self.available_rect_before_wrap()
529-
}
530510
}
531511

532512
/// # `Id` creation

egui/src/widgets/text_edit/builder.rs

-5
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,6 @@ impl<'t> TextEdit<'t> {
190190
self
191191
}
192192

193-
#[deprecated = "Use TextEdit::interactive or ui.add_enabled instead"]
194-
pub fn enabled(self, enabled: bool) -> Self {
195-
self.interactive(enabled)
196-
}
197-
198193
/// Default is `true`. If set to `false` there will be no frame showing that this is editable text!
199194
pub fn frame(mut self, frame: bool) -> Self {
200195
self.frame = frame;

egui_glium/src/painter.rs

-7
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,6 @@ impl Painter {
244244
id
245245
}
246246

247-
#[cfg(feature = "epi")]
248-
#[deprecated = "Use: `NativeTexture::register_native_texture` instead"]
249-
pub fn register_glium_texture(&mut self, texture: Rc<SrgbTexture2d>) -> egui::TextureId {
250-
use epi::NativeTexture as _;
251-
self.register_native_texture(texture)
252-
}
253-
254247
pub fn set_user_texture(
255248
&mut self,
256249
id: egui::TextureId,

egui_web/src/webgl1.rs

-13
Original file line numberDiff line numberDiff line change
@@ -217,19 +217,6 @@ impl WebGlPainter {
217217
}
218218
}
219219

220-
#[deprecated = "Use: `NativeTexture::register_native_texture` instead"]
221-
pub fn register_webgl_texture(&mut self, texture: WebGlTexture) -> egui::TextureId {
222-
let id = self.alloc_user_texture_index();
223-
if let Some(Some(user_texture)) = self.user_textures.get_mut(id) {
224-
*user_texture = UserTexture {
225-
size: (0, 0),
226-
pixels: vec![],
227-
gl_texture: Some(texture),
228-
}
229-
}
230-
egui::TextureId::User(id as u64)
231-
}
232-
233220
fn paint_mesh(&self, mesh: &egui::epaint::Mesh16) -> Result<(), JsValue> {
234221
debug_assert!(mesh.is_valid());
235222

egui_web/src/webgl2.rs

-13
Original file line numberDiff line numberDiff line change
@@ -202,19 +202,6 @@ impl WebGl2Painter {
202202
}
203203
}
204204

205-
#[deprecated = "Use: `NativeTexture::register_native_texture` instead"]
206-
pub fn register_webgl_texture(&mut self, texture: WebGlTexture) -> egui::TextureId {
207-
let id = self.alloc_user_texture_index();
208-
if let Some(Some(user_texture)) = self.user_textures.get_mut(id) {
209-
*user_texture = UserTexture {
210-
size: (0, 0),
211-
pixels: vec![],
212-
gl_texture: Some(texture),
213-
}
214-
}
215-
egui::TextureId::User(id as u64)
216-
}
217-
218205
fn paint_mesh(&self, mesh: &egui::epaint::Mesh16) -> Result<(), JsValue> {
219206
debug_assert!(mesh.is_valid());
220207

epaint/src/text/fonts.rs

-5
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,6 @@ impl Fonts {
271271
}
272272
}
273273

274-
#[deprecated = "Renamed to Fonts::new"]
275-
pub fn from_definitions(pixels_per_point: f32, definitions: FontDefinitions) -> Self {
276-
Self::new(pixels_per_point, definitions)
277-
}
278-
279274
#[inline(always)]
280275
pub fn pixels_per_point(&self) -> f32 {
281276
self.pixels_per_point

0 commit comments

Comments
 (0)