bitsquid_dt/dtmt
bitsquid_dt/dtmt
2
Fork 0
Code Issues 34 Pull requests 11 Projects 1 Releases 3 Packages 1 Wiki Activity
Var Dump: 
dumpVar: only available in dev mode
Mailing List

Darktide Mod Manager #39

Merged
lucas merged 91 commits from feat/dtmm into master 2023-03-01 22:27:42 +01:00
Conversation 0 Commits 91 Files changed 59 +48 -43
2 changed files with 48 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 02fd400912 - Show all commits

9
crates/dtmm/src/ui/widget/mod.rs
View file

@ -1,15 +1,8 @@
use druid::{Data, Widget}; use druid::{Data, Widget};
use self::fill_container::FillContainer;
pub mod container; pub mod container;
pub mod controller; pub mod controller;
pub mod fill_container;
pub trait ExtraWidgetExt<T: Data>: Widget<T> + Sized + 'static { pub trait ExtraWidgetExt<T: Data>: Widget<T> + Sized + 'static {}
fn content_must_fill(self) -> FillContainer<T> {
FillContainer::new(self)
}
}
impl<T: Data, W: Widget<T> + 'static> ExtraWidgetExt<T> for W {} impl<T: Data, W: Widget<T> + 'static> ExtraWidgetExt<T> for W {}

82
crates/dtmm/src/ui/window/main.rs
View file

@ -4,8 +4,8 @@ use druid::widget::{
Maybe, Scroll, SizedBox, Split, TextBox, ViewSwitcher, Maybe, Scroll, SizedBox, Split, TextBox, ViewSwitcher,
}; };
use druid::{ use druid::{
lens, Color, FileDialogOptions, FileSpec, FontDescriptor, FontFamily, Insets, Key, LensExt, lens, Color, FileDialogOptions, FileSpec, FontDescriptor, FontFamily, Key, LensExt, SingleUse,
SingleUse, TextAlignment, Widget, WidgetExt, WindowDesc, TextAlignment, Widget, WidgetExt, WindowDesc,
}; };
use crate::state::{ModInfo, PathBufFormatter, State, View, ACTION_START_RESET_DEPLOYMENT}; use crate::state::{ModInfo, PathBufFormatter, State, View, ACTION_START_RESET_DEPLOYMENT};
@ -15,7 +15,6 @@ use crate::state::{
}; };
use crate::ui::theme; use crate::ui::theme;
use crate::ui::widget::controller::AutoScrollController; use crate::ui::widget::controller::AutoScrollController;
use crate::ui::widget::ExtraWidgetExt;
const TITLE: &str = "Darktide Mod Manager"; const TITLE: &str = "Darktide Mod Manager";
const WINDOW_SIZE: (f64, f64) = (1080., 720.); const WINDOW_SIZE: (f64, f64) = (1080., 720.);
@ -98,24 +97,21 @@ fn build_mod_list() -> impl Widget<State> {
}) })
}); });
let scroll = Scroll::new(list) let scroll = Scroll::new(list).vertical().lens(lens::Identity.map(
.vertical() |state: &State| {
.lens(lens::Identity.map( state
|state: &State| { .mods
state .iter()
.mods .enumerate()
.iter() .map(|(i, val)| (i, val.clone(), Some(i) == state.selected_mod_index))
.enumerate() .collect::<Vector<_>>()
.map(|(i, val)| (i, val.clone(), Some(i) == state.selected_mod_index)) },
.collect::<Vector<_>>() |state, infos| {
}, infos.into_iter().for_each(|(i, info, _)| {
|state, infos| { state.mods.set(i, info);
infos.into_iter().for_each(|(i, info, _)| { });
state.mods.set(i, info); },
}); ));
},
))
.content_must_fill();
Flex::column() Flex::column()
.must_fill_main_axis(true) .must_fill_main_axis(true)
@ -242,29 +238,45 @@ fn build_view_mods() -> impl Widget<State> {
} }
fn build_view_settings() -> impl Widget<State> { fn build_view_settings() -> impl Widget<State> {
let game_dir_setting = Flex::row()
.main_axis_alignment(MainAxisAlignment::Start)
.with_child(Label::new("Game Directory:"))
.with_default_spacer()
.with_child(
TextBox::new()
.with_formatter(PathBufFormatter::new())
.lens(State::game_dir),
);
let data_dir_setting = Flex::row() let data_dir_setting = Flex::row()
.must_fill_main_axis(true)
.main_axis_alignment(MainAxisAlignment::Start) .main_axis_alignment(MainAxisAlignment::Start)
.with_child(Label::new("Data Directory:")) .with_child(Label::new("Data Directory:"))
.with_default_spacer() .with_default_spacer()
.with_child( .with_flex_child(
TextBox::new() TextBox::new()
.with_formatter(PathBufFormatter::new()) .with_formatter(PathBufFormatter::new())
.expand_width()
.lens(State::data_dir), .lens(State::data_dir),
); 1.,
)
.expand_width();
Flex::column() let game_dir_setting = Flex::row()
.must_fill_main_axis(true)
.main_axis_alignment(MainAxisAlignment::Start)
.with_child(Label::new("Game Directory:"))
.with_default_spacer()
.with_flex_child(
TextBox::new()
.with_formatter(PathBufFormatter::new())
.expand_width()
.lens(State::game_dir),
1.,
)
.expand_width();
let content = Flex::column()
.must_fill_main_axis(true)
.cross_axis_alignment(CrossAxisAlignment::Start)
.with_child(data_dir_setting) .with_child(data_dir_setting)
.with_child(game_dir_setting) .with_default_spacer()
.padding(Insets::uniform(5.0)) .with_child(game_dir_setting);
SizedBox::new(content)
.width(800.)
.expand_height()
.padding(5.)
} }
fn build_main() -> impl Widget<State> { fn build_main() -> impl Widget<State> {