merge GUI #1

Merged
Oliver merged 9 commits from gui into master 2025-04-02 06:37:38 +00:00
Showing only changes of commit 82c662f00f - Show all commits

View File

@ -1,7 +1,6 @@
#![feature(iter_map_windows)]
use iced::{
Element, Task, clipboard,
widget::{self, button, column, combo_box, row, scrollable, text, text_input},
clipboard, widget::{self, button, column, combo_box, row, scrollable::{Direction, Scrollbar}, scrollable, text, text_input}, Element, Length, Task
};
use std::{env, fs, path::PathBuf};
use texts::*;
@ -163,7 +162,6 @@ impl State {
scrollable(row((0..self.cols).map(|_| {
row![
button("-"),
column![
combo_box(
&self.files,
@ -197,15 +195,15 @@ impl State {
],
],
button(text("+").center())
.height(iced::Length::FillPortion(1))
.height(Length::Fixed(200.))
.on_press(Message::AddColRight)
]
.width(Length::Fixed(800.))
.into()
})))
.direction(scrollable::Direction::Both {
vertical: scrollable::Scrollbar::new(),
horizontal: scrollable::Scrollbar::new(),
})
}))
// .width(Length::Fixed(1000.))
)
.direction(Direction::Both { vertical: Scrollbar::new(), horizontal: Scrollbar::new() })
.into()
}
}