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

feat(dtmm): Increase textbox size in settings view

Browse source 
Ref: #16.
This commit is contained in:
Lucas Schwiderski 2023-02-28 19:24:19 +01:00
parent 783e0b8de1
commit 02fd400912
Signed by: lucas
GPG key ID: AA12679AAA6DF4D8
2 changed files with 48 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -4,8 +4,8 @@ use druid::widget::{
Maybe, Scroll, SizedBox, Split, TextBox, ViewSwitcher,
};
use druid::{
lens, Color, FileDialogOptions, FileSpec, FontDescriptor, FontFamily, Insets, Key, LensExt,
SingleUse, TextAlignment, Widget, WidgetExt, WindowDesc,
lens, Color, FileDialogOptions, FileSpec, FontDescriptor, FontFamily, Key, LensExt, SingleUse,
TextAlignment, Widget, WidgetExt, WindowDesc,
};
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::widget::controller::AutoScrollController;
use crate::ui::widget::ExtraWidgetExt;
const TITLE: &str = "Darktide Mod Manager";
const WINDOW_SIZE: (f64, f64) = (1080., 720.);
@ -98,9 +97,7 @@ fn build_mod_list() -> impl Widget<State> {
})
});
let scroll = Scroll::new(list)
.vertical()
.lens(lens::Identity.map(
let scroll = Scroll::new(list).vertical().lens(lens::Identity.map(
|state: &State| {
state
.mods
@ -114,8 +111,7 @@ fn build_mod_list() -> impl Widget<State> {
state.mods.set(i, info);
});
},
))
.content_must_fill();
));
Flex::column()
.must_fill_main_axis(true)
@ -242,29 +238,45 @@ fn build_view_mods() -> 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()
.must_fill_main_axis(true)
.main_axis_alignment(MainAxisAlignment::Start)
.with_child(Label::new("Data Directory:"))
.with_default_spacer()
.with_child(
.with_flex_child(
TextBox::new()
.with_formatter(PathBufFormatter::new())
.expand_width()
.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(game_dir_setting)
.padding(Insets::uniform(5.0))
.with_default_spacer()
.with_child(game_dir_setting);
SizedBox::new(content)
.width(800.)
.expand_height()
.padding(5.)
}
fn build_main() -> impl Widget<State> {