arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-24 01:46:31 +00:00
Code Issues Projects Releases Wiki Activity

Deprecate ScrollBase

Browse Source
This commit is contained in:
Alexandre Bury 2020-10-06 09:37:53 -07:00
parent c7c5f7955f
commit 801fa8e54b
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cursive-core/src/view/mod.rs
View File

@ -111,6 +111,7 @@ pub use self::nameable::Nameable;
pub use self::position::{Offset, Position}; pub use self::position::{Offset, Position};
pub use self::resizable::Resizable; pub use self::resizable::Resizable;
pub use self::scroll::ScrollStrategy; pub use self::scroll::ScrollStrategy;
#[allow(deprecated)]
pub use self::scroll_base::ScrollBase; pub use self::scroll_base::ScrollBase;
pub use self::scrollable::Scrollable; pub use self::scrollable::Scrollable;
pub use self::size_cache::SizeCache; pub use self::size_cache::SizeCache;

11
cursive-core/src/view/scroll_base.rs
View File

@ -6,9 +6,15 @@ use std::cmp::{max, min};
/// Provide scrolling functionalities to a view. /// Provide scrolling functionalities to a view.
/// ///
/// You're not supposed to use this directly, /// This is a legacy helper utility to define scrollable views.
/// but it can be helpful if you create your own Views. ///
/// The [`scroll`] module is the preferred way to achieve that.
///
/// [`scroll`]: ./scroll/index.html
#[derive(Default, Debug)] #[derive(Default, Debug)]
#[deprecated(
note = "`ScrollBase` is being deprecated in favor of the view::scroll module."
)]
pub struct ScrollBase { pub struct ScrollBase {
/// First line visible /// First line visible
pub start_line: usize, pub start_line: usize,
@ -35,6 +41,7 @@ pub struct ScrollBase {
pub thumb_grab: Option<usize>, pub thumb_grab: Option<usize>,
} }
#[allow(deprecated)]
impl ScrollBase { impl ScrollBase {
/// Creates a new, uninitialized scrollbar. /// Creates a new, uninitialized scrollbar.
pub fn new() -> Self { pub fn new() -> Self {

4
cursive-core/src/views/text_area.rs
View File

@ -3,6 +3,7 @@ use crate::event::{Event, EventResult, Key, MouseButton, MouseEvent};
use crate::rect::Rect; use crate::rect::Rect;
use crate::theme::{ColorStyle, Effect}; use crate::theme::{ColorStyle, Effect};
use crate::utils::lines::simple::{prefix, simple_prefix, LinesIterator, Row}; use crate::utils::lines::simple::{prefix, simple_prefix, LinesIterator, Row};
#[allow(deprecated)]
use crate::view::{ScrollBase, SizeCache, View}; use crate::view::{ScrollBase, SizeCache, View};
use crate::Vec2; use crate::Vec2;
use crate::{Printer, With, XY}; use crate::{Printer, With, XY};
@ -42,6 +43,7 @@ pub struct TextArea {
enabled: bool, enabled: bool,
/// Base for scrolling features /// Base for scrolling features
#[allow(deprecated)]
scrollbase: ScrollBase, scrollbase: ScrollBase,
/// Cache to avoid re-computing layout on no-op events /// Cache to avoid re-computing layout on no-op events
@ -63,6 +65,7 @@ new_default!(TextArea);
impl TextArea { impl TextArea {
/// Creates a new, empty TextArea. /// Creates a new, empty TextArea.
pub fn new() -> Self { pub fn new() -> Self {
#[allow(deprecated)]
TextArea { TextArea {
content: String::new(), content: String::new(),
rows: Vec::new(), rows: Vec::new(),
@ -614,6 +617,7 @@ impl View for TextArea {
&& position.fits_in_rect(offset, self.last_size) => && position.fits_in_rect(offset, self.last_size) =>
{ {
if let Some(position) = position.checked_sub(offset) { if let Some(position) = position.checked_sub(offset) {
#[allow(deprecated)]
let y = position.y + self.scrollbase.start_line; let y = position.y + self.scrollbase.start_line;
let y = min(y, self.rows.len() - 1); let y = min(y, self.rows.len() - 1);
let x = position.x; let x = position.x;