Skip to content

tui: migrate remaining layouts to Grid #962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Michael Greene (mgreenegit) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

tui: migrate remaining layouts to Grid #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 56 additions & 24 deletions crates/edit/src/bin/edit/draw_editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,16 @@ use crate::localization::*;
use crate::state::*;

pub fn draw_editor(ctx: &mut Context, state: &mut State) {
ctx.block_begin("editor");
ctx.inherit_focus();
ctx.attr_display(Display::Grid);
ctx.attr_grid_template_columns(&[GridTrack::Fraction(1)]);
ctx.attr_grid_template_rows(&[GridTrack::Auto, GridTrack::Fraction(1)]);
ctx.block_begin("search-container");
if !matches!(state.wants_search.kind, StateSearchKind::Hidden | StateSearchKind::Disabled) {
draw_search(ctx, state);
}

let size = ctx.size();
// TODO: The layout code should be able to just figure out the height on its own.
let height_reduction = match state.wants_search.kind {
StateSearchKind::Search => 4,
StateSearchKind::Replace => 5,
_ => 2,
};
ctx.block_end();

if let Some(doc) = state.documents.active() {
ctx.textarea("textarea", doc.buffer.clone());
Expand All @@ -32,7 +31,7 @@ pub fn draw_editor(ctx: &mut Context, state: &mut State) {
ctx.block_end();
}

ctx.attr_intrinsic_size(Size { width: 0, height: size.height - height_reduction });
ctx.block_end();
}

fn draw_search(ctx: &mut Context, state: &mut State) {
Expand Down Expand Up @@ -71,11 +70,19 @@ fn draw_search(ctx: &mut Context, state: &mut State) {
state.wants_search.kind = StateSearchKind::Hidden;
}

ctx.table_begin("needle");
ctx.table_set_cell_gap(Size { width: 1, height: 0 });
ctx.block_begin("needle");
ctx.attr_display(Display::Grid);
ctx.attr_grid_auto_rows(GridTrack::Intrinsic(0));
ctx.attr_grid_template_columns(&[GridTrack::Intrinsic(0), GridTrack::Fraction(1)]);
ctx.attr_focus_navigation(FocusNavigation::Vertical);
ctx.attr_grid_gap(Size { width: 1, height: 0 });
{
{
ctx.table_next_row();
ctx.block_begin("row");
ctx.attr_display(Display::Grid);
ctx.attr_grid_column_subgrid();
ctx.attr_grid_align_items(GridAlignment::Start);
ctx.attr_focus_navigation(FocusNavigation::Horizontal);
ctx.label("label", loc(LocId::SearchNeedleLabel));

if ctx.editline("needle", &mut state.search_needle) {
Expand All @@ -85,7 +92,7 @@ fn draw_search(ctx: &mut Context, state: &mut State) {
ctx.attr_background_rgba(ctx.indexed(IndexedColor::Red));
ctx.attr_foreground_rgba(ctx.indexed(IndexedColor::BrightWhite));
}
ctx.attr_intrinsic_size(Size { width: COORD_TYPE_SAFE_MAX, height: 1 });
ctx.attr_intrinsic_size(Size { width: 0, height: 1 });
if focus == StateSearchKind::Search {
ctx.steal_focus();
}
Expand All @@ -95,11 +102,17 @@ fn draw_search(ctx: &mut Context, state: &mut State) {
}

if state.wants_search.kind == StateSearchKind::Replace {
ctx.table_next_row();
ctx.block_end();
ctx.next_block_id_mixin(1);
ctx.block_begin("row");
ctx.attr_display(Display::Grid);
ctx.attr_grid_column_subgrid();
ctx.attr_grid_align_items(GridAlignment::Start);
ctx.attr_focus_navigation(FocusNavigation::Horizontal);
ctx.label("label", loc(LocId::SearchReplacementLabel));

ctx.editline("replacement", &mut state.search_replacement);
ctx.attr_intrinsic_size(Size { width: COORD_TYPE_SAFE_MAX, height: 1 });
ctx.attr_intrinsic_size(Size { width: 0, height: 1 });
if focus == StateSearchKind::Replace {
ctx.steal_focus();
}
Expand All @@ -112,15 +125,24 @@ fn draw_search(ctx: &mut Context, state: &mut State) {
}
}
}
ctx.table_end();
ctx.block_end();
ctx.block_end();

ctx.table_begin("options");
ctx.table_set_cell_gap(Size { width: 2, height: 0 });
ctx.block_begin("options");
ctx.attr_display(Display::Grid);
ctx.attr_grid_auto_columns(GridTrack::Intrinsic(0));
ctx.attr_grid_auto_rows(GridTrack::Intrinsic(0));
ctx.attr_focus_navigation(FocusNavigation::Vertical);
ctx.attr_grid_gap(Size { width: 2, height: 0 });
{
let mut change = false;
let mut change_action = Some(SearchAction::Search);

ctx.table_next_row();
ctx.block_begin("row");
ctx.attr_display(Display::Grid);
ctx.attr_grid_column_subgrid();
ctx.attr_grid_align_items(GridAlignment::Start);
ctx.attr_focus_navigation(FocusNavigation::Horizontal);

change |= ctx.checkbox(
"match-case",
Expand Down Expand Up @@ -151,7 +173,8 @@ fn draw_search(ctx: &mut Context, state: &mut State) {
action = change_action;
}
}
ctx.table_end();
ctx.block_end();
ctx.block_end();
}
ctx.block_end();

Expand Down Expand Up @@ -238,13 +261,21 @@ pub fn draw_handle_wants_close(ctx: &mut Context, state: &mut State) {
ctx.label("description", loc(LocId::UnsavedChangesDialogDescription));
ctx.attr_padding(Rect::three(1, 2, 1));

ctx.table_begin("choices");
ctx.block_begin("choices");
ctx.attr_display(Display::Grid);
ctx.attr_grid_auto_columns(GridTrack::Intrinsic(0));
ctx.attr_grid_auto_rows(GridTrack::Intrinsic(0));
ctx.attr_focus_navigation(FocusNavigation::Vertical);
ctx.inherit_focus();
ctx.attr_padding(Rect::three(0, 2, 1));
ctx.attr_position(Position::Center);
ctx.table_set_cell_gap(Size { width: 2, height: 0 });
ctx.attr_grid_gap(Size { width: 2, height: 0 });
{
ctx.table_next_row();
ctx.block_begin("row");
ctx.attr_display(Display::Grid);
ctx.attr_grid_column_subgrid();
ctx.attr_grid_align_items(GridAlignment::Start);
ctx.attr_focus_navigation(FocusNavigation::Horizontal);
ctx.inherit_focus();

if ctx.button(
Expand Down Expand Up @@ -275,7 +306,8 @@ pub fn draw_handle_wants_close(ctx: &mut Context, state: &mut State) {
}
}
}
ctx.table_end();
ctx.block_end();
ctx.block_end();
}
if ctx.modal_end() {
action = Action::Cancel;
Expand Down
43 changes: 33 additions & 10 deletions crates/edit/src/bin/edit/draw_filepicker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,32 @@ pub fn draw_file_picker(ctx: &mut Context, state: &mut State) {
let contains_focus = ctx.contains_focus();
let mut activated = false;

ctx.table_begin("path");
ctx.table_set_columns(&[0, COORD_TYPE_SAFE_MAX]);
ctx.table_set_cell_gap(Size { width: 1, height: 0 });
ctx.block_begin("path");
ctx.attr_display(Display::Grid);
ctx.attr_grid_auto_rows(GridTrack::Intrinsic(0));
ctx.attr_grid_template_columns(&[GridTrack::Intrinsic(0), GridTrack::Fraction(1)]);
ctx.attr_focus_navigation(FocusNavigation::Vertical);
ctx.attr_grid_gap(Size { width: 1, height: 0 });
ctx.attr_padding(Rect::two(1, 1));
ctx.inherit_focus();
{
ctx.table_next_row();
ctx.block_begin("row");
ctx.attr_display(Display::Grid);
ctx.attr_grid_column_subgrid();
ctx.attr_grid_align_items(GridAlignment::Start);
ctx.attr_focus_navigation(FocusNavigation::Horizontal);

ctx.label("dir-label", loc(LocId::SaveAsDialogPathLabel));
ctx.label("dir", state.file_picker_pending_dir.as_str());
ctx.attr_overflow(Overflow::TruncateMiddle);

ctx.table_next_row();
ctx.block_end();
ctx.next_block_id_mixin(1);
ctx.block_begin("row");
ctx.attr_display(Display::Grid);
ctx.attr_grid_column_subgrid();
ctx.attr_grid_align_items(GridAlignment::Start);
ctx.attr_focus_navigation(FocusNavigation::Horizontal);
ctx.inherit_focus();

ctx.label("name-label", loc(LocId::SaveAsDialogNameLabel));
Expand Down Expand Up @@ -131,7 +144,8 @@ pub fn draw_file_picker(ctx: &mut Context, state: &mut State) {
activated = true;
}
}
ctx.table_end();
ctx.block_end();
ctx.block_end();

if state.file_picker_entries.is_none() {
draw_dialog_saveas_refresh_files(state);
Expand Down Expand Up @@ -206,13 +220,21 @@ pub fn draw_file_picker(ctx: &mut Context, state: &mut State) {
ctx.attr_overflow(Overflow::TruncateTail);
ctx.attr_padding(Rect::three(1, 2, 1));

ctx.table_begin("choices");
ctx.block_begin("choices");
ctx.attr_display(Display::Grid);
ctx.attr_grid_auto_columns(GridTrack::Intrinsic(0));
ctx.attr_grid_auto_rows(GridTrack::Intrinsic(0));
ctx.attr_focus_navigation(FocusNavigation::Vertical);
ctx.inherit_focus();
ctx.attr_padding(Rect::three(0, 2, 1));
ctx.attr_position(Position::Center);
ctx.table_set_cell_gap(Size { width: 2, height: 0 });
ctx.attr_grid_gap(Size { width: 2, height: 0 });
{
ctx.table_next_row();
ctx.block_begin("row");
ctx.attr_display(Display::Grid);
ctx.attr_grid_column_subgrid();
ctx.attr_grid_align_items(GridAlignment::Start);
ctx.attr_focus_navigation(FocusNavigation::Horizontal);
ctx.inherit_focus();

save = ctx.button("yes", loc(LocId::Yes), ButtonStyle::default());
Expand All @@ -222,7 +244,8 @@ pub fn draw_file_picker(ctx: &mut Context, state: &mut State) {
state.file_picker_overwrite_warning = None;
}
}
ctx.table_end();
ctx.block_end();
ctx.block_end();

if contains_focus {
save |= ctx.consume_shortcut(vk::Y);
Expand Down
55 changes: 42 additions & 13 deletions crates/edit/src/bin/edit/draw_statusbar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,26 @@ use crate::localization::*;
use crate::state::*;

pub fn draw_statusbar(ctx: &mut Context, state: &mut State) {
ctx.table_begin("statusbar");
ctx.block_begin("statusbar");
ctx.attr_display(Display::Grid);
ctx.attr_grid_auto_columns(GridTrack::Intrinsic(0));
ctx.attr_grid_auto_rows(GridTrack::Intrinsic(0));
ctx.attr_focus_navigation(FocusNavigation::Vertical);
ctx.attr_focus_well();
ctx.attr_background_rgba(state.menubar_color_bg);
ctx.attr_foreground_rgba(state.menubar_color_fg);
ctx.table_set_cell_gap(Size { width: 2, height: 0 });
ctx.attr_grid_gap(Size { width: 2, height: 0 });
ctx.attr_intrinsic_size(Size { width: COORD_TYPE_SAFE_MAX, height: 1 });
ctx.attr_padding(Rect::two(0, 1));

if let Some(doc) = state.documents.active() {
let mut tb = doc.buffer.borrow_mut();

ctx.table_next_row();
ctx.block_begin("row");
ctx.attr_display(Display::Grid);
ctx.attr_grid_column_subgrid();
ctx.attr_grid_align_items(GridAlignment::Start);
ctx.attr_focus_navigation(FocusNavigation::Horizontal);

state.wants_language_picker |= ctx.button(
"language",
Expand Down Expand Up @@ -94,7 +102,11 @@ pub fn draw_statusbar(ctx: &mut Context, state: &mut State) {
ButtonStyle::default(),
);
if state.wants_indentation_picker {
ctx.table_begin("indentation-picker");
ctx.block_begin("indentation-picker");
ctx.attr_display(Display::Grid);
ctx.attr_grid_auto_columns(GridTrack::Intrinsic(0));
ctx.attr_grid_auto_rows(GridTrack::Intrinsic(0));
ctx.attr_focus_navigation(FocusNavigation::Vertical);
ctx.attr_float(FloatSpec {
anchor: Anchor::Last,
gravity_x: 0.0,
Expand All @@ -104,13 +116,17 @@ pub fn draw_statusbar(ctx: &mut Context, state: &mut State) {
});
ctx.attr_border();
ctx.attr_padding(Rect::two(0, 1));
ctx.table_set_cell_gap(Size { width: 1, height: 0 });
ctx.attr_grid_gap(Size { width: 1, height: 0 });
{
if ctx.contains_focus() && ctx.consume_shortcut(vk::RETURN) {
ctx.toss_focus_up();
}

ctx.table_next_row();
ctx.block_begin("row");
ctx.attr_display(Display::Grid);
ctx.attr_grid_column_subgrid();
ctx.attr_grid_align_items(GridAlignment::Start);
ctx.attr_focus_navigation(FocusNavigation::Horizontal);

ctx.list_begin("type");
ctx.focus_on_first_present();
Expand Down Expand Up @@ -148,7 +164,8 @@ pub fn draw_statusbar(ctx: &mut Context, state: &mut State) {
}
ctx.list_end();
}
ctx.table_end();
ctx.block_end();
ctx.block_end();

if !ctx.contains_focus() {
state.wants_indentation_picker = false;
Expand Down Expand Up @@ -199,13 +216,14 @@ pub fn draw_statusbar(ctx: &mut Context, state: &mut State) {
ctx.attr_position(Position::Right);
}
ctx.block_end();
ctx.block_end();
} else {
state.wants_statusbar_focus = false;
state.wants_encoding_picker = false;
state.wants_indentation_picker = false;
}

ctx.table_end();
ctx.block_end();
}

pub fn draw_dialog_language_change(ctx: &mut Context, state: &mut State) {
Expand Down Expand Up @@ -270,12 +288,22 @@ pub fn draw_dialog_encoding_change(ctx: &mut Context, state: &mut State) {
if reopen { loc(LocId::EncodingReopen) } else { loc(LocId::EncodingConvert) },
);
{
ctx.table_begin("encoding-search");
ctx.table_set_columns(&[0, COORD_TYPE_SAFE_MAX]);
ctx.table_set_cell_gap(Size { width: 1, height: 0 });
ctx.block_begin("encoding-search");
ctx.attr_display(Display::Grid);
ctx.attr_grid_auto_rows(GridTrack::Intrinsic(0));
ctx.attr_grid_template_columns(&[
GridTrack::Intrinsic(0),
GridTrack::Intrinsic(COORD_TYPE_SAFE_MAX),
]);
ctx.attr_focus_navigation(FocusNavigation::Vertical);
ctx.attr_grid_gap(Size { width: 1, height: 0 });
ctx.inherit_focus();
{
ctx.table_next_row();
ctx.block_begin("row");
ctx.attr_display(Display::Grid);
ctx.attr_grid_column_subgrid();
ctx.attr_grid_align_items(GridAlignment::Start);
ctx.attr_focus_navigation(FocusNavigation::Horizontal);
ctx.inherit_focus();

ctx.label("needle-label", loc(LocId::SearchNeedleLabel));
Expand All @@ -285,7 +313,8 @@ pub fn draw_dialog_encoding_change(ctx: &mut Context, state: &mut State) {
}
ctx.inherit_focus();
}
ctx.table_end();
ctx.block_end();
ctx.block_end();

ctx.scrollarea_begin("scrollarea", Size { width, height });
ctx.attr_background_rgba(ctx.indexed_alpha(IndexedColor::Black, 1, 4));
Expand Down
Loading
Loading