Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: ♻️ move voxygen hud update definitions from common/trade to voxygen/hud & trade

Browse Source
This commit is contained in:
jh0l 2022-03-07 09:39:01 +11:00 committed by Marcel Märtens
parent de70ce61d8
commit 403a523ec7
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/trade.rs
View File

@ -1,4 +1,4 @@
use std::{cmp::Ordering, sync::atomic::Ordering};
use std::cmp::Ordering;
use crate::{
comp::inventory::{slot::InvSlotId, trade_pricing::TradePricing, Inventory},
@ -37,13 +37,8 @@ pub enum TradeAction {
/// multiple times
Accept(TradePhase),
Decline,
Voxygen(VoxygenUpdate),
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub enum VoxygenUpdate {
Focus(usize),
Clear,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub enum TradeResult {
Completed,
@ -102,13 +97,13 @@ impl TradePhase {
}
impl TradeAction {
pub fn delta_item(item: InvSlotId, delta: i32, ours: bool) -> Option<Self> {
pub fn item(item: InvSlotId, delta: i32, ours: bool) -> Option<Self> {
match delta.cmp(&0) {
Ordering::Equal => None,
Ordering::Less => Some(TradeAction::RemoveItem {
item,
ours,
quantity: delta as u32,
quantity: -delta as u32,
}),
Ordering::Greater => Some(TradeAction::AddItem {
item,

9
voxygen/src/hud/mod.rs
View File

@ -2854,13 +2854,12 @@ impl Hud {
)
.set(self.ids.trade, ui_widgets)
{
use common::trade::VoxygenUpdate::*;
match action {
TradeAction::Voxygen(update) => match update {
Focus(idx) => self.to_focus = Some(Some(widget::Id::new(idx))),
Clear => self.show.trade_amount_input_key = None,
Err(update) => match update {
trade::HudUpdate::Focus(idx) => self.to_focus = Some(Some(idx)),
trade::HudUpdate::Clear => self.show.trade_amount_input_key = None,
},
_ => {
Ok(action) => {
if let TradeAction::Decline = action {
self.show.stats = false;
self.show.trade(false);

35
voxygen/src/hud/trade.rs
View File

@ -1,5 +1,3 @@
use std::cmp::Ordering;
use conrod_core::{
color,
position::Relative,
@ -15,7 +13,7 @@ use common::{
inventory::item::{ItemDesc, MaterialStatManifest, Quality},
Inventory, Stats,
},
trade::{PendingTrade, SitePrices, TradeAction, TradePhase, VoxygenUpdate},
trade::{PendingTrade, SitePrices, TradeAction, TradePhase},
};
use common_net::sync::WorldSyncExt;
use i18n::Localization;
@ -36,6 +34,12 @@ use super::{
Hud, Show, TradeAmountInput, TEXT_COLOR, TEXT_GRAY_COLOR, UI_HIGHLIGHT_0, UI_MAIN,
};
#[derive(Debug)]
pub enum HudUpdate {
Focus(widget::Id),
Clear,
}
pub struct State {
ids: Ids,
bg_ids: BackgroundIds,
@ -173,7 +177,7 @@ impl<'a> Trade<'a> {
trade: &'a PendingTrade,
prices: &'a Option<SitePrices>,
ours: bool,
) -> <Self as Widget>::Event {
) -> Option<TradeAction> {
let inventories = self.client.inventories();
let check_if_us = |who: usize| -> Option<_> {
let uid = trade.parties[who];
@ -483,7 +487,7 @@ impl<'a> Trade<'a> {
state: &mut ConrodState<'_, State>,
ui: &mut UiCell<'_>,
trade: &'a PendingTrade,
) -> <Self as Widget>::Event {
) -> Option<TradeAction> {
let mut event = None;
let (hover_img, press_img, accept_button_luminance) = if trade.is_empty_trade() {
//Darken the accept button if the trade is empty.
@ -540,7 +544,6 @@ impl<'a> Trade<'a> {
ui: &mut UiCell<'_>,
trade: &'a PendingTrade,
) -> <Self as Widget>::Event {
use VoxygenUpdate::*;
let mut event = None;
let selected = self.slot_manager.selected().and_then(|s| match s {
SlotKind::Trade(t_s) => t_s.invslot.and_then(|slot| {
@ -586,7 +589,7 @@ impl<'a> Trade<'a> {
.set(state.ids.amount_open_btn, ui)
.was_clicked()
{
event = Some(TradeAction::Voxygen(Focus(state.ids.amount_input.index())));
event = Some(Err(HudUpdate::Focus(state.ids.amount_input)));
self.slot_manager.idle();
self.show.trade_amount_input_key =
Some(TradeAmountInput::new(slot, input, inv, ours, who));
@ -597,7 +600,7 @@ impl<'a> Trade<'a> {
.set(state.ids.amount_open_ovlay, ui);
} else if let Some(key) = &mut self.show.trade_amount_input_key {
if selected.is_some() || (!Hud::_typing(ui) && key.input_painted) {
event = Some(TradeAction::Voxygen(Clear));
event = Some(Err(HudUpdate::Clear));
}
key.input_painted = true;
@ -609,7 +612,7 @@ impl<'a> Trade<'a> {
.set(state.ids.amount_btn, ui)
.was_clicked()
{
event = Some(TradeAction::Voxygen(Clear));
event = Some(Err(HudUpdate::Clear));
}
// Input for making TradeAction requests
let text_color = key.err.as_ref().and(Some(color::RED)).unwrap_or(TEXT_COLOR);
@ -625,14 +628,14 @@ impl<'a> Trade<'a> {
key.input = new_input.trim().to_owned();
if !key.input.is_empty() {
// trade amount can change with (shift||ctrl)-click
let amount = trade.offers[key.who].get(&key.slot).unwrap_or(&0);
let amount = *trade.offers[key.who].get(&key.slot).unwrap_or(&0);
match key.input.parse::<i32>() {
Ok(new_amount) => {
key.input = format!("{}", new_amount);
if new_amount > -1 && new_amount <= key.inv as i32 {
key.err = None;
let delta = new_amount - *amount as i32;
event = TradeAction::delta_item(key.slot, delta, key.ours);
let delta = new_amount - amount as i32;
event = TradeAction::item(key.slot, delta, key.ours).map(Ok);
} else {
key.err = Some("out of range".to_owned());
}
@ -677,7 +680,7 @@ impl<'a> Trade<'a> {
}
impl<'a> Widget for Trade<'a> {
type Event = Result<TradeAction, VoxygenUpdate>;
type Event = Option<Result<TradeAction, HudUpdate>>;
type State = State;
type Style = ();
@ -700,7 +703,7 @@ impl<'a> Widget for Trade<'a> {
let mut event = None;
let (trade, prices) = match self.client.pending_trade() {
Some((_, trade, prices)) => (trade, prices),
None => return Some(TradeAction::Decline),
None => return Some(Ok(TradeAction::Decline)),
};
if state.ids.inv_alignment.len() < 2 {
@ -729,7 +732,9 @@ impl<'a> Widget for Trade<'a> {
event = self.item_pane(state, ui, trade, prices, true).or(event);
event = self.accept_decline_buttons(state, ui, trade).or(event);
event = self.close_button(state, ui).or(event);
event = self.input_item_amount(state, ui, trade).or(event);
let event = self
.input_item_amount(state, ui, trade)
.or_else(|| event.map(Ok));
event
}
}