arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-23 17:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Do not shrink panels beyond the minimum width required for the title. (#572)

Browse Source
This commit is contained in:
Maarten de Vries 2021-04-06 18:28:00 +02:00 committed by GitHub
parent 352ef92c29
commit 4b1efa4ec2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cursive-core/src/views/panel.rs
View File

@ -26,6 +26,9 @@ pub struct Panel<V> {
new_default!(Panel<V: Default>); new_default!(Panel<V: Default>);
/// Minimum distance between title and borders.
const TITLE_SPACING: usize = 3;
impl<V> Panel<V> { impl<V> Panel<V> {
/// Creates a new panel around the given view. /// Creates a new panel around the given view.
pub fn new(view: V) -> Self { pub fn new(view: V) -> Self {
@ -65,15 +68,10 @@ impl<V> Panel<V> {
fn draw_title(&self, printer: &Printer) { fn draw_title(&self, printer: &Printer) {
if !self.title.is_empty() { if !self.title.is_empty() {
let len = self.title.width(); let len = self.title.width();
let spacing = 3; //minimum distance to borders let x = TITLE_SPACING
let spacing_both_ends = 2 * spacing;
if len + spacing_both_ends > printer.size.x {
return;
}
let x = spacing
+ self + self
.title_position .title_position
.get_offset(len, printer.size.x - spacing_both_ends); .get_offset(len, printer.size.x - 2 * TITLE_SPACING);
printer.with_high_border(false, |printer| { printer.with_high_border(false, |printer| {
printer.print((x - 2, 0), "┤ "); printer.print((x - 2, 0), "┤ ");
printer.print((x + len, 0), " ├"); printer.print((x + len, 0), " ├");
@ -103,7 +101,13 @@ impl<V: View> ViewWrapper for Panel<V> {
// TODO: make borders conditional? // TODO: make borders conditional?
let req = req.saturating_sub((2, 2)); let req = req.saturating_sub((2, 2));
self.view.required_size(req) + (2, 2) let size = self.view.required_size(req) + (2, 2);
if self.title.is_empty() {
size
} else {
let title_width = self.title.width() + 2 * TITLE_SPACING;
size.or_max((title_width, 0))
}
} }
fn wrap_draw(&self, printer: &Printer) { fn wrap_draw(&self, printer: &Printer) {