tzemanovic/inflorescence - Change I2AG42PAVOII4V4TWDJV5ZVNDIHKBRDT254BFQLFUIY723TW6CCQC

new cols layout

Created by Tomáš Zemanovič on June 10, 2025

I2AG42PAVOII4V4TWDJV5ZVNDIHKBRDT254BFQLFUIY723TW6CCQC

Dependencies

In channels

main

Change contents

Replacement in libflorescence/src/testing.rs at line 34 [19.5]

B:BD[19.361] → [19.361:440]

    unsafe { std::env::set_var("PIJUL_CONFIG_DIR", &dir.path().as_os_str()) };

[19.361]

[19.440]

    unsafe { std::env::set_var("PIJUL_CONFIG_DIR", dir.path().as_os_str()) };

Replacement in libflorescence/src/repo/test.rs at line 67 [22.1959]
B:BD[22.3720] → [22.3720:3740]
```
            .last()
```
[22.3720]
[22.3740]
```
            .next_back()
```
Replacement in libflorescence/src/repo/test.rs at line 128 [22.1959]
B:BD[24.848] → [26.209:247]
```
        diff.changes.get(0).unwrap(),
```
[24.848]
[24.887]
```
        diff.changes.first().unwrap(),
```
Replacement in libflorescence/src/repo/test.rs at line 178 [22.1959]
B:BD[25.557] → [26.774:812]
```
        diff.changes.get(0).unwrap(),
```
[25.557]
[25.596]
```
        diff.changes.first().unwrap(),
```
Replacement in justfile at line 31 [2.4]
B:BD[2.363] → [3.2338:2368]
```
    cargo +{{nightly}} clippy
```
[2.363]
[2.380]
```
    cargo +{{nightly}} clippy --all-targets
```

Insertion in inflorescence_view/src/testing.rs at line 19 [13.599]

[13.908]

pub const WINDOW_SIZE: iced::Size = iced::Size {
    width: 1024.0,
    height: 768.0,
};

Replacement in inflorescence_view/src/testing.rs at line 76 [13.599]
B:BD[13.1945] → [13.1945:2002]
```
        Size::Fullscreen => iced::Size::new(512., 384.),
```
[13.1945]
[13.2002]
```
        Size::Fullscreen => WINDOW_SIZE,
```
Insertion in inflorescence_view/src/app.rs at line 15 [12.12409]
[12.12674]
[12.12674]
```
use std::cmp;
```

Insertion in inflorescence_view/src/app.rs at line 21 [12.12409]

[12.12753]

/// Default min. width of a main view column
const DEFAULT_MIN_COL_WIDTH: usize = 512;

Insertion in inflorescence_view/src/app.rs at line 26 [12.12409]
[12.12793]
[12.12793]
```
    pub window_size: iced::Size,
```

Replacement in inflorescence_view/src/app.rs at line 243 [12.12409]

B:BD[23.4017] → [23.4017:4064]

                el(scrollable(column(files))),

[23.4017]

[12.23465]

                el(scrollable(column(files).width(Length::Fill))),

Insertion in inflorescence_view/src/app.rs at line 245 [12.12409]

[12.23480]

[23.4065]

            .width(Length::Fill)
            .height(Length::Fill)

Replacement in inflorescence_view/src/app.rs at line 252 [12.12409]

B:BD[23.4143] → [23.4143:4203]

    let left_view = match state.cursor.selection.as_ref() {

[23.4143]

[23.4203]

    // The number of visible columns depends on the screen width. Any cols on
    // left that don't fit will be hidden
    let max_visible_cols = cmp::max(
        2,
        state.window_size.width.floor() as usize / DEFAULT_MIN_COL_WIDTH,
    );
    let depth = if let Some(RecordMsg::Typing(_)) = state.record_msg.as_ref() {
        1
    } else if let Some(selection) = state.cursor.selection.as_ref() {
        match selection {
            cursor::Selection::UntrackedFile { .. }
            | cursor::Selection::ChangedFile { .. }
            | cursor::Selection::LogChange { file: None, .. } => 1,
            cursor::Selection::LogChange { file: Some(_), .. } => 2,
        }
    } else {
        0
    };
    let hidden_cols = (depth + 1_usize).saturating_sub(max_visible_cols);
    // dbg!(
    //     state.window_size.width,
    //     max_visible_cols,
    //     depth,
    //     hidden_cols
    // );
    let col_0 = el(column([
        repo_info,
        el(column([el(text("Untracked files:")), untracked_files()])),
        el(column([el(text("Changed files:")), changed_files()])),
        el(column([el(text("Recent changes:")), log()])),
    ])
    .width(Length::Fill)
    .height(Length::Fill));
    let col_1 = el(column([
        el(column([record_msg_editor, selection_details])
            .width(Length::Fill)
            .height(Length::Fill)),
        if hidden_cols == 1 {
            el(button(row([
                el(text("← ").font(Font::MONOSPACE)),
                el(text("Status")),
            ]))
            .on_press(Msg::Cursor(cursor::Msg::Left)))
        } else {
            el(row([]))
        },
    ])
    .width(Length::Fill)
    .height(Length::Fill));
    let col_2 = match state.cursor.selection.as_ref() {

Replacement in inflorescence_view/src/app.rs at line 313 [12.12409]

B:BD[23.4399] → [23.4399:5333]

        }) => el(column([
            view_diff_header(format!(
                "{path} changes in {}:",
                display_short_hash(hash)
            )),
            match diffs {
                Some(diffs) => {
                    let (file, state) = diffs.get(path).unwrap();
                    diff::view(Some(state), file).map(|action| {
                        Msg::LogChangeFileDiffAction {
                            hash: *hash,
                            file: path.clone(),
                            action,
                        }
                    })
                }
                None => el(text("Loading diff..")),
            },
        ])
        .width(Length::FillPortion(1))
        .spacing(SPACING)),
        Some(cursor::Selection::UntrackedFile { .. })
        | Some(cursor::Selection::ChangedFile { .. })
        | Some(cursor::Selection::LogChange { .. })
        | None => el(column([

[23.4399]

[27.28]

        }) => Some(el(column([

Replacement in inflorescence_view/src/app.rs at line 315 [12.12409]

B:BD[27.52] → [27.52:299]

                repo_info,
                el(column([el(text("Untracked files:")), untracked_files()])),
                el(column([el(text("Changed files:")), changed_files()])),
                el(column([el(text("Recent changes:")), log()])),

[27.52]

[27.299]

                view_diff_header(format!(
                    "{path} changes in {}:",
                    display_short_hash(hash)
                )),
                match diffs {
                    Some(diffs) => {
                        let (file, state) = diffs.get(path).unwrap();
                        diff::view(Some(state), file).map(|action| {
                            Msg::LogChangeFileDiffAction {
                                hash: *hash,
                                file: path.clone(),
                                action,
                            }
                        })
                    }
                    None => el(text("Loading diff..")),
                },

Replacement in inflorescence_view/src/app.rs at line 334 [12.12409]

B:BD[27.347] → [27.347:574]

            .height(Length::Fill)),
            el(button(row([
                el(text("←").font(Font::MONOSPACE)),
                el(text(" Nav back placeholder")),
            ]))
            .on_press(Msg::SaveRecord)),

[27.347]

[23.5564]

            .height(Length::Fill)
            .spacing(SPACING)),
            // NOTE: This is currently never true - there are only up to 3 cols
            if hidden_cols == 2 {
                el(button(row([
                    el(text("← ").font(Font::MONOSPACE)),
                    el(text("Log")),
                ]))
                .on_press(Msg::Cursor(cursor::Msg::Left)))
            } else {
                el(row([]))
            },

Replacement in inflorescence_view/src/app.rs at line 349 [12.12409]
∅:D[27.634] → [23.5614:5649]
B:BD[23.5614] → [23.5614:5649]
```
        .spacing(SPACING)),
    };
```
[27.634]
[12.24109]
```
        .spacing(SPACING))),
```

Replacement in inflorescence_view/src/app.rs at line 351 [12.12409]

B:BD[12.24110] → [27.635:736]

    let right_view =
        el(column([record_msg_editor, selection_details]).width(Length::Fill));

[12.24110]

[12.24230]

        Some(cursor::Selection::UntrackedFile { .. })
        | Some(cursor::Selection::ChangedFile { .. })
        | Some(cursor::Selection::LogChange { .. })
        | None => None,
    };

Replacement in inflorescence_view/src/app.rs at line 357 [12.12409]

B:BD[12.24231] → [23.5763:5817]

    el(row([left_view, right_view]).spacing(SPACING))

[12.24231]

[12.24344]

    if let Some(col_2) = col_2 {
        let cols = [col_0, col_1, col_2].into_iter().skip(hidden_cols);
        el(row(cols).spacing(SPACING))
    } else {
        let cols = [col_0, col_1];
        el(row(cols).spacing(SPACING))
    }

Insertion in inflorescence_view/src/app/test.rs at line 13 [13.4223]

[16.5949]

[13.4465]


const WINDOW_SIZE: iced::Size = iced::Size {
    width: 1024.0,
    height: 768.0,
};

Insertion in inflorescence_view/src/app/test.rs at line 38 [13.4223]
[13.4978]
[13.4978]
```
        window_size: WINDOW_SIZE,
```
Insertion in inflorescence_view/src/app/test.rs at line 64 [13.4223]
[14.128]
[14.128]
```
        window_size: WINDOW_SIZE,
```
Insertion in inflorescence_view/src/app/test.rs at line 103 [13.4223]
[15.8299]
[15.8299]
```
        window_size: WINDOW_SIZE,
```
Insertion in inflorescence_view/src/app/test.rs at line 122 [13.4223]
[17.1307]
[17.1307]
```
        window_size: WINDOW_SIZE,
```
Insertion in inflorescence_view/src/app/test.rs at line 151 [13.4223]
[13.5661]
[13.5661]
```
        window_size: WINDOW_SIZE,
```
Replacement in inflorescence/src/test.rs at line 35 [19.2521]
B:BD[19.2925] → [19.2925:2952]
```
    // - Msg::WindowOpened
```
[19.2925]
[19.2952]
```
    // - Msg::NoOp from opening a window
```

Replacement in inflorescence/src/test.rs at line 47 [19.2521]

B:BD[19.3353] → [19.3353:3420]

        if !window_opened && matches!(msg, Msg::WindowOpened(_)) {

[19.3353]

[19.3420]

        if !window_opened && matches!(msg, Msg::NoOp) {

Replacement in inflorescence/src/test.rs at line 263 [19.2521]

B:BD[21.3256] → [21.3256:3321]

        app::RecordMsg::Typing(msg) if &msg.text() == record_msg

[21.3256]

[21.3321]

        app::RecordMsg::Typing(msg) if msg.text() == record_msg

Replacement in inflorescence/src/main.rs at line 68 [2.2763]

∅:D[19.4278] → [11.163:203]

∅:D[12.25551] → [11.163:203]

B:BD[4.1124] → [11.163:203]

B:BD[11.203] → [18.5498:5554]

    let (window_id, open_window_task) =
        task::open_window(window::Settings::default());

[19.4278]

[19.4279]

    let window_settings = window::Settings::default();
    let window_size = window_settings.size;
    let (window_id, open_window_task) = task::open_window(window_settings);

Replacement in inflorescence/src/main.rs at line 87 [2.2763]

B:BD[10.2157] → [12.25686:25735]

        open_window_task.map(Msg::WindowOpened),

[10.2157]

[11.708]

        open_window_task.map(|_id| Msg::NoOp),

Insertion in inflorescence/src/main.rs at line 97 [2.2763]
[8.776]
[7.201]
```
            window_size,
```
Insertion in inflorescence/src/main.rs at line 114 [2.2763]
[8.797]
[7.258]
```
    window_size: iced::Size,
```
Replacement in inflorescence/src/main.rs at line 128 [2.2763]
∅:D[12.25803] → [11.784:814]
B:BD[5.668] → [11.784:814]
```
    WindowOpened(window::Id),
```
[12.25803]
[9.4573]
```
    NoOp,
    Window(window::Event),
```
Insertion in inflorescence/src/main.rs at line 141 [2.2763]
[6.6718]
[12.25859]
```
        Msg::NoOp => Task::none(),
```

Replacement in inflorescence/src/main.rs at line 143 [2.2763]

B:BD[12.25919] → [12.25919:25967]

        Msg::WindowOpened(_id) => Task::none(),

[12.25919]

[12.25967]

        Msg::Window(event) => update_from_window_event(state, event),

Insertion in inflorescence/src/main.rs at line 173 [2.2763]

[20.455]

fn update_from_window_event(
    state: &mut State,
    event: window::Event,
) -> Task<Msg> {
    match event {
        window::Event::Opened { position: _, size }
        | window::Event::Resized(size) => {
            state.window_size = size;
        }
        window::Event::Closed
        | window::Event::Moved(_)
        | window::Event::RedrawRequested(_)
        | window::Event::CloseRequested
        | window::Event::Focused
        | window::Event::Unfocused
        | window::Event::FileHovered(_)
        | window::Event::FileDropped(_)
        | window::Event::FilesHoveredLeft => {}
    }
    Task::none()
}

Replacement in inflorescence/src/main.rs at line 673 [2.2763]
B:BD[5.2763] → [5.2763:2794]
```
    on_key_press(|key, mods| {
```
[5.2763]
[5.2794]
```
    let key_subs = on_key_press(|key, mods| {
```

Replacement in inflorescence/src/main.rs at line 719 [2.2763]

B:BD[5.3176] → [5.3176:3183]

})

[5.3176]

[5.4172]

    });
    let window_subs = window::events().map(|(_id, event)| Msg::Window(event));
    Subscription::batch([key_subs, window_subs])

Insertion in inflorescence/src/main.rs at line 729 [2.2763]
[12.28563]
[12.28563]
```
        window_size,
```
Insertion in inflorescence/src/main.rs at line 741 [2.2763]
[12.28768]
[12.28768]
```
            window_size: *window_size,
```

new cols layout

Dependencies

In channels

Change contents

Replacement in libflorescence/src/testing.rs at line 34 [19.5]

Replacement in libflorescence/src/repo/test.rs at line 67 [22.1959]

Replacement in libflorescence/src/repo/test.rs at line 128 [22.1959]

Replacement in libflorescence/src/repo/test.rs at line 178 [22.1959]

Replacement in justfile at line 31 [2.4]

Insertion in inflorescence_view/src/testing.rs at line 19 [13.599]

Replacement in inflorescence_view/src/testing.rs at line 76 [13.599]

Insertion in inflorescence_view/src/app.rs at line 15 [12.12409]

Insertion in inflorescence_view/src/app.rs at line 21 [12.12409]

Insertion in inflorescence_view/src/app.rs at line 26 [12.12409]

Replacement in inflorescence_view/src/app.rs at line 243 [12.12409]

Insertion in inflorescence_view/src/app.rs at line 245 [12.12409]

Replacement in inflorescence_view/src/app.rs at line 252 [12.12409]

Replacement in inflorescence_view/src/app.rs at line 313 [12.12409]

Replacement in inflorescence_view/src/app.rs at line 315 [12.12409]

Replacement in inflorescence_view/src/app.rs at line 334 [12.12409]

Replacement in inflorescence_view/src/app.rs at line 349 [12.12409]

Replacement in inflorescence_view/src/app.rs at line 351 [12.12409]

Replacement in inflorescence_view/src/app.rs at line 357 [12.12409]

Insertion in inflorescence_view/src/app/test.rs at line 13 [13.4223]

Insertion in inflorescence_view/src/app/test.rs at line 38 [13.4223]

Insertion in inflorescence_view/src/app/test.rs at line 64 [13.4223]

Insertion in inflorescence_view/src/app/test.rs at line 103 [13.4223]

Insertion in inflorescence_view/src/app/test.rs at line 122 [13.4223]

Insertion in inflorescence_view/src/app/test.rs at line 151 [13.4223]

Replacement in inflorescence/src/test.rs at line 35 [19.2521]

Replacement in inflorescence/src/test.rs at line 47 [19.2521]

Replacement in inflorescence/src/test.rs at line 263 [19.2521]

Replacement in inflorescence/src/main.rs at line 68 [2.2763]

Replacement in inflorescence/src/main.rs at line 87 [2.2763]

Insertion in inflorescence/src/main.rs at line 97 [2.2763]

Insertion in inflorescence/src/main.rs at line 114 [2.2763]

Replacement in inflorescence/src/main.rs at line 128 [2.2763]

Insertion in inflorescence/src/main.rs at line 141 [2.2763]

Replacement in inflorescence/src/main.rs at line 143 [2.2763]

Insertion in inflorescence/src/main.rs at line 173 [2.2763]

Replacement in inflorescence/src/main.rs at line 673 [2.2763]

Replacement in inflorescence/src/main.rs at line 719 [2.2763]

Insertion in inflorescence/src/main.rs at line 729 [2.2763]

Insertion in inflorescence/src/main.rs at line 741 [2.2763]