summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/horizontcontainer.cpp53
-rw-r--r--src/gui/widgets/horizontcontainer.h54
-rw-r--r--src/gui/widgets/inventoryfilter.cpp54
-rw-r--r--src/gui/widgets/inventoryfilter.h56
-rw-r--r--src/gui/widgets/itemcontainer.cpp62
-rw-r--r--src/gui/widgets/itemcontainer.h6
6 files changed, 279 insertions, 6 deletions
diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp
new file mode 100644
index 000000000..6ecd3f933
--- /dev/null
+++ b/src/gui/widgets/horizontcontainer.cpp
@@ -0,0 +1,53 @@
+/*
+ * The Mana Client
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011 The ManaPlus Developers
+ *
+ * This file is part of The Mana Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/widgets/horizontcontainer.h"
+
+HorizontContainer::HorizontContainer(int height, int spacing):
+ mSpacing(spacing),
+ mCount(0),
+ mLastX(0)
+{
+ setHeight(height);
+ addWidgetListener(this);
+}
+
+void HorizontContainer::add(gcn::Widget *widget)
+{
+ if (!widget)
+ return;
+
+ Container::add(widget);
+ widget->setPosition(mLastX, 0);
+ mCount++;
+ mLastX += widget->getWidth() + mSpacing;
+}
+
+void HorizontContainer::clear()
+{
+ Container::clear();
+
+ mCount = 0;
+}
+
+void HorizontContainer::widgetResized(const gcn::Event &event _UNUSED_)
+{
+}
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
new file mode 100644
index 000000000..b8325a564
--- /dev/null
+++ b/src/gui/widgets/horizontcontainer.h
@@ -0,0 +1,54 @@
+/*
+ * The Mana Client
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011 The ManaPlus Developers
+ *
+ * This file is part of The Mana Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_HORIZONTCONTAINER_H
+#define GUI_HORIZONTCONTAINER_H
+
+#include "gui/widgets/container.h"
+
+#include <guichan/widgetlistener.hpp>
+
+#ifdef __GNUC__
+#define _UNUSED_ __attribute__ ((unused))
+#else
+#define _UNUSED_
+#endif
+
+/**
+ * A widget container.
+ *
+ * This container places it's contents veritcally.
+ */
+class HorizontContainer : public Container, public gcn::WidgetListener
+{
+ public:
+ HorizontContainer(int height, int spacing);
+ virtual void add(gcn::Widget *widget);
+ virtual void clear();
+ void widgetResized(const gcn::Event &event);
+
+ protected:
+ int mSpacing;
+ int mCount;
+ int mLastX;
+};
+
+#endif
diff --git a/src/gui/widgets/inventoryfilter.cpp b/src/gui/widgets/inventoryfilter.cpp
new file mode 100644
index 000000000..faceafa9e
--- /dev/null
+++ b/src/gui/widgets/inventoryfilter.cpp
@@ -0,0 +1,54 @@
+/*
+ * The Mana Client
+ * Copyright (C) 2011 The ManaPlus Developers
+ *
+ * This file is part of The Mana Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/widgets/inventoryfilter.h"
+
+#include "gui/widgets/horizontcontainer.h"
+#include "gui/widgets/radiobutton.h"
+
+#include "log.h"
+
+InventoryFilter::InventoryFilter(std::string group, int height, int spacing):
+ HorizontContainer(height, spacing),
+ mGroup(group)
+{
+}
+
+void InventoryFilter::add(std::string tag)
+{
+ if (tag.empty())
+ return;
+
+ RadioButton *radio = new RadioButton(tag, mGroup, mCount == 0);
+ radio->adjustSize();
+ radio->setActionEventId("tag_" + tag);
+ radio->addActionListener(this);
+ HorizontContainer::add(radio);
+}
+
+void InventoryFilter::action(const gcn::ActionEvent &event)
+{
+ ActionListenerIterator iter;
+ for (iter = mActionListeners.begin();
+ iter != mActionListeners.end(); ++iter)
+ {
+ (*iter)->action(event);
+ }
+} \ No newline at end of file
diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h
new file mode 100644
index 000000000..28423413f
--- /dev/null
+++ b/src/gui/widgets/inventoryfilter.h
@@ -0,0 +1,56 @@
+/*
+ * The Mana Client
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011 The ManaPlus Developers
+ *
+ * This file is part of The Mana Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_INVENTORYFILTER_H
+#define GUI_INVENTORYFILTER_H
+
+#include <guichan/actionlistener.hpp>
+#include <guichan/widgetlistener.hpp>
+
+#include "gui/widgets/horizontcontainer.h"
+
+#ifdef __GNUC__
+#define _UNUSED_ __attribute__ ((unused))
+#else
+#define _UNUSED_
+#endif
+
+//class HorizontContainer;
+
+/**
+ * A widget container.
+ *
+ * This container places it's contents veritcally.
+ */
+class InventoryFilter : public HorizontContainer, public gcn::ActionListener
+{
+ public:
+ InventoryFilter(std::string group, int height, int spacing);
+
+ void add(std::string tag);
+
+ void action(const gcn::ActionEvent &event);
+
+ private:
+ std::string mGroup;
+};
+
+#endif
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 8b5b1914a..3f6a6b45c 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -65,7 +65,9 @@ ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity):
mSelectionStatus(SEL_NONE),
mForceQuantity(forceQuantity),
mSwapItems(false),
- mDescItems(false)
+ mDescItems(false),
+ mTag(0),
+ mShowMatrix(0)
{
mItemPopup = new ItemPopup;
setFocusable(true);
@@ -108,21 +110,29 @@ void ItemContainer::logic()
void ItemContainer::draw(gcn::Graphics *graphics)
{
- if (!mInventory)
+ if (!mInventory || !mShowMatrix)
return;
Graphics *g = static_cast<Graphics*>(graphics);
g->setFont(getFont());
- for (int i = 0; i < mGridColumns; i++)
+ int i = 0;
+ int j = 0;
+
+// int idx = 0;
+
+ for (int j = 0; j < mGridRows; j++)
{
- for (int j = 0; j < mGridRows; j++)
+ for (int i = 0; i < mGridColumns; i++)
{
int itemX = i * BOX_WIDTH;
int itemY = j * BOX_HEIGHT;
- int itemIndex = (j * mGridColumns) + i;
- Item *item = mInventory->getItem(itemIndex);
+ int itemIndex = j * mGridColumns + i;
+ if (mShowMatrix[itemIndex] < 0)
+ continue;
+
+ Item *item = mInventory->getItem(mShowMatrix[itemIndex]);
if (!item || item->getId() == 0)
continue;
@@ -385,6 +395,40 @@ void ItemContainer::adjustHeight()
++mGridRows;
setHeight(mGridRows * BOX_HEIGHT);
+
+ updateMatrix();
+}
+
+void ItemContainer::updateMatrix()
+{
+ delete mShowMatrix;
+ mShowMatrix = new int[mGridRows * mGridColumns];
+ memset(mShowMatrix, -1, mGridRows * mGridColumns);
+
+ int i = 0;
+ int j = 0;
+
+ for (int idx = 0; idx < mInventory->getSize(); idx ++)
+ {
+// int itemX = i * BOX_WIDTH;
+// int itemY = j * BOX_HEIGHT;
+ int itemIndex = idx;
+ Item *item = mInventory->getItem(itemIndex);
+
+ if (!item || item->getId() == 0 || !item->isHaveTag(mTag))
+ continue;
+
+ mShowMatrix[j * mGridColumns + i] = itemIndex;
+
+ i ++;
+ if (i >= mGridColumns)
+ {
+ i = 0;
+ j ++;
+ }
+ if (j >= mGridRows)
+ break;
+ }
}
int ItemContainer::getSlotIndex(int x, int y) const
@@ -473,3 +517,9 @@ void ItemContainer::moveHighlight(Direction direction)
break;
}
}
+
+void ItemContainer::setFilter (int tag)
+{
+ mTag = tag;
+ updateMatrix();
+} \ No newline at end of file
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 8aaa236b4..9ce819534 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -119,6 +119,8 @@ class ItemContainer : public gcn::Widget,
void removeSelectionListener(gcn::SelectionListener *listener)
{ mSelectionListeners.remove(listener); }
+ void setFilter (int tag);
+
private:
enum Direction
{
@@ -173,6 +175,8 @@ class ItemContainer : public gcn::Widget,
*/
int getSlotIndex(int x, int y) const;
+ void updateMatrix();
+
Inventory *mInventory;
int mGridColumns, mGridRows;
Image *mSelImg;
@@ -183,8 +187,10 @@ class ItemContainer : public gcn::Widget,
bool mSwapItems;
bool mDescItems;
int mDragPosX, mDragPosY;
+ int mTag;
ItemPopup *mItemPopup;
+ int *mShowMatrix;
typedef std::list<gcn::SelectionListener*> SelectionListenerList;
typedef SelectionListenerList::iterator SelectionListenerIterator;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-03 21:40:14 +0000