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

Reduce the title drawing cut-off point by 2 characters.

Browse Source 
Panels and dialogs have borders with corners.
Previously, the title would draw over the border corner, including its own end-points.
Now the cut-off point is such that we do not draw the title if the right-hand end point and the border-corner do not also fit.
This commit is contained in:
Chris Vest 2019-03-03 10:37:50 +01:00
parent 40adcffbf5
commit 7564a5d1db
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/dialog.rs
View File

@ -461,14 +461,15 @@ impl Dialog {
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();
if len + 4 > printer.size.x { let spacing = 3; //minimum distance to borders
let spacing_both_ends = 2 * spacing;
if len + spacing_both_ends > printer.size.x {
return; return;
} }
let spacing = 3; //minimum distance to borders
let x = spacing let x = spacing
+ self + self
.title_position .title_position
.get_offset(len, printer.size.x - 2 * spacing); .get_offset(len, printer.size.x - spacing_both_ends);
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), " ├");

7
src/views/panel.rs
View File

@ -65,14 +65,15 @@ impl<V: View> 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();
if len + 4 > printer.size.x { let spacing = 3; //minimum distance to borders
let spacing_both_ends = 2 * spacing;
if len + spacing_both_ends > printer.size.x {
return; return;
} }
let spacing = 3; //minimum distance to borders
let x = spacing let x = spacing
+ self + self
.title_position .title_position
.get_offset(len, printer.size.x - 2 * spacing); .get_offset(len, printer.size.x - spacing_both_ends);
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), " ├");