diff options
| -rw-r--r-- | src/gui/widgets/itemcontainer.h | 6 | ||||
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/maileditwindow.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/mailviewwindow.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/tradewindow.cpp | 6 |
6 files changed, 14 insertions, 9 deletions
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index c992c43f5..38af6e821 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -53,9 +53,9 @@ class ItemContainer final : public Widget, public: ItemContainer(const Widget2 *const widget, Inventory *const inventory, - const int maxColumns = 100000, - const ShowEmptyRows showEmptyRows = ShowEmptyRows_false, - const ForceQuantity forceQuantity = ForceQuantity_false); + const int maxColumns, + const ShowEmptyRows showEmptyRows, + const ForceQuantity forceQuantity); A_DELETE_COPY(ItemContainer) diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index ee0d566ce..00ce036e8 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -87,7 +87,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : InventoryListener(), AttributeListener(), mInventory(inventory), - mItems(new ItemContainer(this, mInventory)), + mItems(new ItemContainer(this, mInventory, 100000, + ShowEmptyRows_false, ForceQuantity_false)), mUseButton(nullptr), mDropButton(nullptr), mOutfitButton(nullptr), diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp index 5ca0d34c6..08f70b4fa 100644 --- a/src/gui/windows/maileditwindow.cpp +++ b/src/gui/windows/maileditwindow.cpp @@ -76,7 +76,8 @@ MailEditWindow::MailEditWindow() : mMessageField(new TextField(this)), mInventory(new Inventory(InventoryType::MailEdit, settings.enableNewMailSystem ? -1 : 1)), - mItemContainer(new ItemContainer(this, mInventory)), + mItemContainer(new ItemContainer(this, mInventory, 100000, + ShowEmptyRows_false, ForceQuantity_false)), mItemScrollArea(new ScrollArea(this, mItemContainer, fromBool(getOptionBool("showitemsbackground"), Opaque), "mailedit_listbackground.xml")), diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index 911cb5de7..add46a7f2 100644 --- a/src/gui/windows/mailviewwindow.cpp +++ b/src/gui/windows/mailviewwindow.cpp @@ -77,7 +77,8 @@ MailViewWindow::MailViewWindow(MailMessage *const message, mMessageLabel(new Label(this, strprintf("%s %s", _("Message:"), message->text.c_str()))), mInventory(new Inventory(InventoryType::MailView, itemsCount)), - mItemContainer(new ItemContainer(this, mInventory)), + mItemContainer(new ItemContainer(this, mInventory, 100000, + ShowEmptyRows_false, ForceQuantity_false)), mItemScrollArea(new ScrollArea(this, mItemContainer, fromBool(getOptionBool("showitemsbackground"), Opaque), "mailview_listbackground.xml")), diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index ab6e4bc71..bb770d1e0 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -138,7 +138,7 @@ NpcDialog::NpcDialog(const BeingId npcId) : mInventory(new Inventory(InventoryType::Npc, 1)), mComplexInventory(new ComplexInventory(InventoryType::Craft, 1)), mItemContainer(new ItemContainer(this, mInventory, - 10000, ShowEmptyRows_true)), + 10000, ShowEmptyRows_true, ForceQuantity_false)), mItemScrollArea(new ScrollArea(this, mItemContainer, fromBool(getOptionBool("showitemsbackground"), Opaque), "npc_listbackground.xml")), diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 3f16b0b4b..8b730218c 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -79,8 +79,10 @@ TradeWindow::TradeWindow() : SelectionListener(), mMyInventory(new Inventory(InventoryType::Trade, -1)), mPartnerInventory(new Inventory(InventoryType::Trade, -1)), - mMyItemContainer(new ItemContainer(this, mMyInventory)), - mPartnerItemContainer(new ItemContainer(this, mPartnerInventory)), + mMyItemContainer(new ItemContainer(this, mMyInventory, 100000, + ShowEmptyRows_false, ForceQuantity_false)), + mPartnerItemContainer(new ItemContainer(this, mPartnerInventory, 100000, + ShowEmptyRows_false, ForceQuantity_false)), // TRANSLATORS: trade window money label mMoneyLabel(new Label(this, strprintf(_("You get %s"), ""))), // TRANSLATORS: trade window button |