Added swap_equipped_weapons icon and resized inactive weapons

assets/voxygen/i18n/en/hud/bag.ron

@@ -26,6 +26,8 @@
         "hud.bag.offhand": "Offhand",
         "hud.bag.inactive_mainhand": "Inactive Mainhand",
         "hud.bag.inactive_offhand": "Inactive Offhand",
+        "hud.bag.swap_equipped_weapons_title": "Swap equipped weapons",
+        "hud.bag.swap_equipped_weapons_desc": "Press {key}",
         "hud.bag.bag": "Bag",
         "hud.bag.health": "Health",
         "hud.bag.stamina": "Stamina",

voxygen/src/hud/bag.rs

@@ -13,6 +13,8 @@ use crate::{
         ImageFrame, ItemTooltip, ItemTooltipManager, ItemTooltipable, Tooltip, TooltipManager,
         Tooltipable,
     },
+    window::GameInput,
+    GlobalState,
 };
 use client::Client;
 use common::{
@@ -466,6 +468,7 @@ widget_ids! {
 #[derive(WidgetCommon)]
 pub struct Bag<'a> {
     client: &'a Client,
+    global_state: &'a GlobalState,
     imgs: &'a Imgs,
     item_imgs: &'a ItemImgs,
     fonts: &'a Fonts,
@@ -490,6 +493,7 @@ impl<'a> Bag<'a> {
     #[allow(clippy::too_many_arguments)] // TODO: Pending review in #587
     pub fn new(
         client: &'a Client,
+        global_state: &'a GlobalState,
         imgs: &'a Imgs,
         item_imgs: &'a ItemImgs,
         fonts: &'a Fonts,
@@ -509,6 +513,7 @@ impl<'a> Bag<'a> {
     ) -> Self {
         Self {
             client,
+            global_state,
             imgs,
             item_imgs,
             fonts,
@@ -571,6 +576,7 @@ impl<'a> Widget for Bag<'a> {
     fn update(self, args: widget::UpdateArgs<Self>) -> Self::Event {
         let widget::UpdateArgs { state, ui, .. } = args;
         let i18n = &self.localized_strings;
+        let key_layout = &self.global_state.window.key_layout;
 
         let mut event = None;
         let bag_tooltip = Tooltip::new({
@@ -694,7 +700,7 @@ impl<'a> Widget for Bag<'a> {
         if inventory.slots().count() > 45 || self.show.bag_inv {
             let expand_btn_top = if self.show.bag_inv { 53.0 } else { 460.0 };
             if expand_btn
-                .top_right_with_margins_on(state.bg_ids.bg_frame, expand_btn_top, 30.0)
+                .top_right_with_margins_on(state.bg_ids.bg_frame, expand_btn_top, 37.0)
                 .with_tooltip(self.tooltip_manager, &txt, "", &bag_tooltip, TEXT_COLOR)
                 .set(state.ids.bag_expand_btn, ui)
                 .was_clicked()
@@ -1208,9 +1214,9 @@ impl<'a> Widget for Bag<'a> {
                 .map(|item| item.to_owned());
 
             let slot = slot_maker
-                .fabricate(EquipSlot::InactiveMainhand, [38.0; 2])
-                .bottom_right_with_margins_on(state.ids.active_mainhand_slot, 2.0, -44.0)
-                .with_icon(self.imgs.mainhand_bg, Vec2::new(33.5, 33.5), Some(UI_MAIN))
+                .fabricate(EquipSlot::InactiveMainhand, [40.0; 2])
+                .bottom_right_with_margins_on(state.ids.active_mainhand_slot, 3.0, -47.0)
+                .with_icon(self.imgs.mainhand_bg, Vec2::new(35.0, 35.0), Some(UI_MAIN))
                 .filled_slot(filled_slot);
             if let Some(item) = mainhand_item {
                 slot.with_item_tooltip(self.item_tooltip_manager, &item, &None, &item_tooltip)
@@ -1231,9 +1237,9 @@ impl<'a> Widget for Bag<'a> {
                 .equipped(EquipSlot::InactiveOffhand)
                 .map(|item| item.to_owned());
             let slot = slot_maker
-                .fabricate(EquipSlot::InactiveOffhand, [38.0; 2])
-                .bottom_left_with_margins_on(state.ids.active_offhand_slot, 2.0, -44.0)
-                .with_icon(self.imgs.offhand_bg, Vec2::new(33.5, 33.5), Some(UI_MAIN))
+                .fabricate(EquipSlot::InactiveOffhand, [40.0; 2])
+                .bottom_left_with_margins_on(state.ids.active_offhand_slot, 3.0, -47.0)
+                .with_icon(self.imgs.offhand_bg, Vec2::new(35.0, 35.0), Some(UI_MAIN))
                 .filled_slot(filled_slot);
             if let Some(item) = offhand_item {
                 slot.with_item_tooltip(self.item_tooltip_manager, &item, &None, &item_tooltip)
@@ -1252,9 +1258,27 @@ impl<'a> Widget for Bag<'a> {
             if Button::image(self.imgs.swap_equipped_weapons_btn)
                 .hover_image(self.imgs.swap_equipped_weapons_btn_hover)
                 .press_image(self.imgs.swap_equipped_weapons_btn_press)
-                .w_h(12.0, 30.0)
-                .down_from(state.ids.legs_slot, 19.5)
-                .align_middle_x_of(state.ids.legs_slot)
+                .w_h(32.0, 40.0)
+                .bottom_left_with_margins_on(state.bg_ids.bg_frame, 0.0, 23.3)
+                .align_middle_y_of(state.ids.active_mainhand_slot)
+                .with_tooltip(
+                    self.tooltip_manager,
+                    i18n.get("hud.bag.swap_equipped_weapons_title"),
+                    if let Some(key) = self
+                        .global_state
+                        .settings
+                        .controls
+                        .get_binding(GameInput::SwapLoadout)
+                    {
+                        i18n.get("hud.bag.swap_equipped_weapons_desc")
+                            .replace("{key}", key.display_string(key_layout).as_str())
+                    } else {
+                        "".to_string()
+                    }
+                    .as_str(),
+                    &tooltip,
+                    color::WHITE,
+                )
                 .set(state.ids.swap_equipped_weapons_btn, ui)
                 .was_clicked()
             {

voxygen/src/hud/img_ids.rs

@@ -421,9 +421,9 @@ image_ids! {
         inv_sort_btn: "voxygen.element.ui.bag.buttons.inv_sort",
         inv_sort_btn_hover: "voxygen.element.ui.bag.buttons.inv_sort_hover",
         inv_sort_btn_press: "voxygen.element.ui.bag.buttons.inv_sort_press",
-        swap_equipped_weapons_btn: "voxygen.element.ui.generic.buttons.button",
-        swap_equipped_weapons_btn_hover: "voxygen.element.ui.generic.buttons.button_hover",
-        swap_equipped_weapons_btn_press: "voxygen.element.ui.generic.buttons.button_press",
+        swap_equipped_weapons_btn: "voxygen.element.ui.bag.buttons.swap_equipped_weapons",
+        swap_equipped_weapons_btn_hover: "voxygen.element.ui.bag.buttons.swap_equipped_weapons_hover",
+        swap_equipped_weapons_btn_press: "voxygen.element.ui.bag.buttons.swap_equipped_weapons_press",
         coin_ico: "voxygen.element.items.coin",
         cheese_ico: "voxygen.element.items.item_cheese",
         inv_bg_armor: "voxygen.element.ui.bag.inv_bg_0",

voxygen/src/hud/mod.rs

@@ -2449,6 +2449,7 @@ impl Hud {
             ) {
                 match Bag::new(
                     client,
+                    global_state,
                     &self.imgs,
                     &self.item_imgs,
                     &self.fonts,