zhangyiss/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2025-07-15 23:51:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor tweaks.

Browse Source
This commit is contained in:
ArthurSonzogni 2024-11-07 21:05:34 +01:00
parent da7eebd98f
commit 2157605cd1
No known key found for this signature in database
GPG Key ID: 41D98248C074CD6C
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -46,6 +46,9 @@ current (development)
- Feature: Add `hscroll_indicator`. It display an horizontal indicator
reflecting the current scroll position. Proposed by @ibrahimnasson in
[issue 752](https://github.com/ArthurSonzogni/FTXUI/issues/752)
- Feature: Add `extend_beyond_screen` option to `Dimension::Fit(..)`, allowing
the element to be larger than the screen. Proposed by @LordWhiro. See #572 and
#949.
### Screen
- Feature: Add `Box::IsEmpty()`.

3
examples/dom/table.cpp
View File

@ -55,7 +55,8 @@ int main() {
content.DecorateCellsAlternateRow(color(Color::White), 3, 2);
auto document = table.Render();
auto screen = Screen::Create(Dimension::Fit(document));
auto screen =
Screen::Create(Dimension::Fit(document, /*extend_beyond_screen=*/true));
Render(screen, document);
screen.Print();
std::cout << std::endl;

19
src/ftxui/dom/util.cpp
View File

@ -106,9 +106,10 @@ Dimensions Dimension::Fit(Element& e, bool extend_beyond_screen) {
// Don't give the element more space than it needs:
box.x_max = std::min(box.x_max, e->requirement().min_x);
box.y_max = extend_beyond_screen
? e->requirement().min_y // can exceed size in Y if extend_beyond_screen==true
: std::min(box.y_max, e->requirement().min_y);
box.y_max = e->requirement().min_y;
if (!extend_beyond_screen) {
box.y_max = std::min(box.y_max, fullsize.dimy);
}
e->SetBox(box);
status.need_iteration = false;
@ -118,12 +119,14 @@ Dimensions Dimension::Fit(Element& e, bool extend_beyond_screen) {
if (!status.need_iteration) {
break;
}
// Increase the size of the box until it fits, but not more than the size of
// the terminal emulator:
// Increase the size of the box until it fits...
box.x_max = std::min(e->requirement().min_x, fullsize.dimx);
box.y_max = extend_beyond_screen
? e->requirement().min_y // can exceed size in Y if extend_beyond_screen==true
: std::min(e->requirement().min_y, fullsize.dimy);
box.y_max = e->requirement().min_y;
// ... but don't go beyond the screen size:
if (!extend_beyond_screen) {
box.y_max = std::min(box.y_max, fullsize.dimy);
}
}
return {