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): Use Nexus mod details when available

Browse source
This commit is contained in:
Lucas Schwiderski 2023-03-15 19:46:53 +01:00
parent 6a52f3efc2
commit 146714d882
Signed by: lucas
GPG key ID: AA12679AAA6DF4D8
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/dtmm/src/state/data.rs
View file

@ -74,7 +74,7 @@ pub(crate) struct NexusInfo {
pub id: u64, pub id: u64,
pub version: String, pub version: String,
pub author: String, pub author: String,
pub summary: String, pub summary: Arc<String>,
pub description: Arc<String>, pub description: Arc<String>,
} }
@ -84,7 +84,7 @@ impl From<NexusMod> for NexusInfo {
id: value.mod_id, id: value.mod_id,
version: value.version, version: value.version,
author: value.author, author: value.author,
summary: value.summary, summary: Arc::new(value.summary),
description: Arc::new(value.description), description: Arc::new(value.description),
} }
} }

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

@ -15,8 +15,8 @@ use druid::{Data, ImageBuf, LifeCycleCtx};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use crate::state::{ use crate::state::{
ModInfo, State, View, ACTION_ADD_MOD, ACTION_SELECTED_MOD_DOWN, ACTION_SELECTED_MOD_UP, ModInfo, NexusInfo, NexusInfoLens, State, View, ACTION_ADD_MOD, ACTION_SELECTED_MOD_DOWN,
ACTION_SELECT_MOD, ACTION_SET_WINDOW_HANDLE, ACTION_START_CHECK_UPDATE, ACTION_SELECTED_MOD_UP, ACTION_SELECT_MOD, ACTION_SET_WINDOW_HANDLE, ACTION_START_CHECK_UPDATE,
ACTION_START_DELETE_SELECTED_MOD, ACTION_START_DEPLOY, ACTION_START_RESET_DEPLOYMENT, ACTION_START_DELETE_SELECTED_MOD, ACTION_START_DEPLOY, ACTION_START_RESET_DEPLOYMENT,
}; };
use crate::ui::theme::{self, ColorExt, COLOR_YELLOW_LIGHT}; use crate::ui::theme::{self, ColorExt, COLOR_YELLOW_LIGHT};
@ -294,12 +294,18 @@ fn build_mod_details_info() -> impl Widget<State> {
.lens(ModInfo::name.in_arc()); .lens(ModInfo::name.in_arc());
let summary = Label::raw() let summary = Label::raw()
.with_line_break_mode(LineBreaking::WordWrap) .with_line_break_mode(LineBreaking::WordWrap)
.lens(ModInfo::summary.in_arc()); .lens(NexusInfoLens::new(NexusInfo::summary, ModInfo::summary).in_arc());
// TODO: Image/icon? // TODO: Image/icon?
let version_line = Label::dynamic(|info: &Arc<ModInfo>, _| { let version_line = Label::dynamic(|info: &Arc<ModInfo>, _| {
if let Some(author) = &info.author { let author = info
.nexus
.as_ref()
.map(|n| &n.author)
.or(info.author.as_ref());
if let Some(author) = &author {
format!("Version: {}, by {author}", info.version) format!("Version: {}, by {author}", info.version)
} else { } else {
format!("Version: {}", info.version) format!("Version: {}", info.version)