Add popup list. Replace listbox in dropdown to popup list.

2 files changed, 0 insertions, 705 deletions

diff --git a/src/guichan/include/guichan/widgets/dropdown.hpp b/src/guichan/include/guichan/widgets/dropdown.hpp
deleted file mode 100644
index 0bdec632c..000000000
--- a/src/guichan/include/guichan/widgets/dropdown.hpp
+++ /dev/null
@@ -1,322 +0,0 @@
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012  The ManaPlus Developers
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_DROPDOWN_HPP
-#define GCN_DROPDOWN_HPP
-
-#include "guichan/actionlistener.hpp"
-#include "guichan/basiccontainer.hpp"
-#include "guichan/deathlistener.hpp"
-#include "guichan/focushandler.hpp"
-#include "guichan/focuslistener.hpp"
-#include "guichan/keylistener.hpp"
-#include "guichan/listmodel.hpp"
-#include "guichan/mouselistener.hpp"
-#include "guichan/platform.hpp"
-#include "guichan/selectionlistener.hpp"
-#include "guichan/widgets/listbox.hpp"
-#include "guichan/widgets/scrollarea.hpp"
-
-#include "localconsts.h"
-
-namespace gcn
-{
-    /**
-     * An implementation of a drop downable list from which an item can be
-     * selected. The drop down consists of an internal ScrollArea and an
-     * internal ListBox. The drop down also uses an internal FocusHandler to
-     * handle the focus of the internal ScollArea and the internal ListBox. The
-     * scroll area and the list box can be passed to the drop down if a custom
-     * scroll area and or a custom list box is preferable.
-     *
-     * To be able display a list the drop down uses a user provided list model.
-     * A list model can be any class that implements the ListModel interface.
-     *
-     * If an item is selected in the drop down a select event will be sent to
-     * all selection listeners of the drop down. If an item is selected by
-     * using a mouse click or by using the enter or space key an action event
-     * will be sent to all action listeners of the drop down.
-     */
-    class GCN_CORE_DECLSPEC DropDown :
-        public ActionListener,
-        public BasicContainer,
-        public KeyListener,
-        public MouseListener,
-        public FocusListener,
-        public SelectionListener
-    {
-    public:
-        /**
-         * Contructor.
-         *
-         * @param listModel the ListModel to use.
-         * @param scrollArea the ScrollArea to use.
-         * @param listBox the listBox to use.
-         * @see ListModel, ScrollArea, ListBox.
-         */
-        DropDown(ListModel *const listModel = nullptr,
-                 ScrollArea *const scrollArea = nullptr,
-                 ListBox *const listBox = nullptr);
-
-        A_DELETE_COPY(DropDown)
-
-        /**
-         * Destructor.
-         */
-        virtual ~DropDown();
-
-        /**
-         * Gets the selected item as an index in the list model.
-         *
-         * @return the selected item as an index in the list model.
-         * @see setSelected
-         */
-        int getSelected() const;
-
-        /**
-         * Sets the selected item. The selected item is represented by
-         * an index from the list model.
-         *
-         * @param selected the selected item as an index from the list model.
-         * @see getSelected
-         */
-        void setSelected(int selected);
-
-        /**
-         * Sets the list model to use when displaying the list.
-         *
-         * @param listModel the list model to use.
-         * @see getListModel
-         */
-        void setListModel(ListModel *listModel);
-
-        /**
-         * Gets the list model used.
-         *
-         * @return the ListModel used.
-         * @see setListModel
-         */
-        ListModel *getListModel();
-
-        /**
-         * Adjusts the height of the drop down to fit the height of the
-         * drop down's parent's height. It's used to not make the drop down
-         * draw itself outside of it's parent if folded down.
-         */
-        void adjustHeight();
-
-        /**
-         * Adds a selection listener to the drop down. When the selection
-         * changes an event will be sent to all selection listeners of the
-         * drop down.
-         *
-         * If you delete your selection listener, be sure to also remove it
-         * using removeSelectionListener().
-         *
-         * @param listener the selection listener to add.
-         * @since 0.8.0
-         */
-        void addSelectionListener(SelectionListener* listener);
-
-        /**
-         * Removes a selection listener from the drop down.
-         *
-         * @param selectionListener the selection listener to remove.
-         * @since 0.8.0
-         */
-        void removeSelectionListener(SelectionListener* selectionListener);
-
-
-        // Inherited from Widget
-
-        void setBaseColor(const Color& color);
-
-        void setBackgroundColor(const Color& color);
-
-        void setForegroundColor(const Color& color);
-
-        void setFont(Font *font);
-
-        void setSelectionColor(const Color& color);
-
-
-        // Inherited from BasicContainer
-
-        virtual Rectangle getChildrenArea();
-
-
-        // Inherited from FocusListener
-
-        virtual void focusLost(const Event& event);
-
-
-        // Inherited from ActionListener
-
-        virtual void action(const ActionEvent& actionEvent);
-
-
-        // Inherited from DeathListener
-
-        virtual void death(const Event& event);
-
-
-        // Inherited from KeyListener
-
-        virtual void keyPressed(KeyEvent& keyEvent) override = 0;
-
-
-        // Inherited from MouseListener
-
-        virtual void mousePressed(MouseEvent& mouseEvent) override;
-
-        virtual void mouseReleased(MouseEvent& mouseEvent) override;
-
-        virtual void mouseWheelMovedUp(MouseEvent& mouseEvent) override;
-
-        virtual void mouseWheelMovedDown(MouseEvent& mouseEvent) override;
-
-        virtual void mouseDragged(MouseEvent& mouseEvent) override;
-
-
-        // Inherited from SelectionListener
-
-        virtual void valueChanged(const SelectionEvent& event);
-
-    protected:
-        /**
-         * Draws the button of the drop down.
-         *
-         * @param graphics a Graphics object to draw with.
-         */
-        virtual void drawButton(Graphics *graphics) = 0;
-
-        /**
-         * Sets the drop down to be dropped down.
-         */
-        virtual void dropDown();
-
-        /**
-         * Sets the drop down to be folded up.
-         */
-        virtual void foldUp();
-
-        /**
-         * Distributes a value changed event to all selection listeners
-         * of the drop down.
-         *
-         * @since 0.8.0
-         */
-        void distributeValueChangedEvent();
-
-        /**
-         * True if the drop down is dropped down, false otherwise.
-         */
-        bool mDroppedDown;
-
-        /**
-         * True if the drop down has been pushed with the mouse, false
-         * otherwise.
-         */
-        bool mPushed;
-
-        /**
-         * Holds what the height is if the drop down is folded up. Used when
-         * checking if the list of the drop down was clicked or if the upper
-         * part of the drop down was clicked on a mouse click.
-         */
-        int mFoldedUpHeight;
-
-        /**
-         * True if an internal scroll area is used, false if a scroll area
-         * has been passed to the drop down which the drop down should not
-         * deleted in it's destructor.
-         */
-        bool mInternalScrollArea;
-
-        /**
-         * The scroll area used.
-         */
-        ScrollArea* mScrollArea;
-
-        /**
-         * True if an internal list box is used, false if a list box
-         * has been passed to the drop down which the drop down should not
-         * deleted in it's destructor.
-         */
-        bool mInternalListBox;
-
-        /**
-         * The list box used.
-         */
-        ListBox* mListBox;
-
-        /**
-         * The internal focus handler used to keep track of focus for the
-         * internal list box.
-         */
-        FocusHandler mInternalFocusHandler;
-
-        /**
-         * True if the drop down is dragged.
-         */
-        bool mIsDragged;
-
-        /**
-         * Typedef.
-         */
-        typedef std::list<SelectionListener*> SelectionListenerList;
-
-        /**
-         * The selection listener's of the drop down.
-         */
-        SelectionListenerList mSelectionListeners;
-
-        /**
-         * Typedef.
-         */
-        typedef SelectionListenerList::iterator SelectionListenerIterator;
-    };
-}
-
-#endif // end GCN_DROPDOWN_HPP
diff --git a/src/guichan/widgets/dropdown.cpp b/src/guichan/widgets/dropdown.cpp
deleted file mode 100644
index fda433e51..000000000
--- a/src/guichan/widgets/dropdown.cpp
+++ /dev/null
@@ -1,383 +0,0 @@
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012  The ManaPlus Developers
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "guichan/widgets/dropdown.hpp"
-
-#include "guichan/exception.hpp"
-#include "guichan/font.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/key.hpp"
-#include "guichan/listmodel.hpp"
-#include "guichan/mouseinput.hpp"
-#include "guichan/widgets/listbox.hpp"
-#include "guichan/widgets/scrollarea.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    DropDown::DropDown(ListModel *const listModel,
-                       ScrollArea *const scrollArea,
-                       ListBox *const listBox) :
-        gcn::ActionListener(),
-        gcn::BasicContainer(),
-        gcn::KeyListener(),
-        gcn::MouseListener(),
-        gcn::FocusListener(),
-        gcn::SelectionListener(),
-        mDroppedDown(false),
-        mPushed(false),
-        mFoldedUpHeight(0),
-        mInternalScrollArea(!scrollArea),
-        mScrollArea(mInternalScrollArea ? new ScrollArea : scrollArea),
-        mInternalListBox(!listBox),
-        mListBox(mInternalListBox ? new ListBox() : listBox),
-        mIsDragged(false)
-    {
-        setWidth(100);
-        setFocusable(true);
-
-        setInternalFocusHandler(&mInternalFocusHandler);
-        mScrollArea->setContent(mListBox);
-        add(mScrollArea);
-
-        mListBox->addActionListener(this);
-        mListBox->addSelectionListener(this);
-
-        setListModel(listModel);
-
-        if (mListBox->getSelected() < 0)
-            mListBox->setSelected(0);
-
-        addMouseListener(this);
-        addKeyListener(this);
-        addFocusListener(this);
-
-        adjustHeight();
-    }
-
-    DropDown::~DropDown()
-    {
-        if (widgetExists(mListBox))
-        {
-            mListBox->removeActionListener(this);
-            mListBox->removeSelectionListener(this);
-        }
-
-        if (mInternalScrollArea)
-        {
-            delete mScrollArea;
-            mScrollArea = nullptr;
-        }
-
-        if (mInternalListBox)
-        {
-            delete mListBox;
-            mListBox = nullptr;
-        }
-
-        setInternalFocusHandler(nullptr);
-    }
-
-    int DropDown::getSelected() const
-    {
-        return mListBox->getSelected();
-    }
-
-    void DropDown::setSelected(int selected)
-    {
-        if (selected >= 0)
-            mListBox->setSelected(selected);
-    }
-
-    void DropDown::mousePressed(MouseEvent& mouseEvent)
-    {
-        // If we have a mouse press on the widget.
-        if (0 <= mouseEvent.getY()
-            && mouseEvent.getY() < getHeight()
-            && mouseEvent.getX() >= 0
-            && mouseEvent.getX() < getWidth()
-            && mouseEvent.getButton() == MouseEvent::LEFT
-            && !mDroppedDown
-            && mouseEvent.getSource() == this)
-        {
-            mPushed = true;
-            dropDown();
-            requestModalMouseInputFocus();
-        }
-        // Fold up the listbox if the upper part is clicked after fold down
-        else if (0 <= mouseEvent.getY()
-                 && mouseEvent.getY() < mFoldedUpHeight
-                 && mouseEvent.getX() >= 0
-                 && mouseEvent.getX() < getWidth()
-                 && mouseEvent.getButton() == MouseEvent::LEFT
-                 && mDroppedDown
-                 && mouseEvent.getSource() == this)
-        {
-            mPushed = false;
-            foldUp();
-            releaseModalMouseInputFocus();
-        }
-        // If we have a mouse press outside the widget
-        else if (0 > mouseEvent.getY()
-                 || mouseEvent.getY() >= getHeight()
-                 || mouseEvent.getX() < 0
-                 || mouseEvent.getX() >= getWidth())
-        {
-            mPushed = false;
-            foldUp();
-        }
-    }
-
-    void DropDown::mouseReleased(MouseEvent& mouseEvent)
-    {
-        if (mIsDragged)
-            mPushed = false;
-
-        // Released outside of widget. Can happen when we have modal
-        // input focus.
-        if ((0 > mouseEvent.getY()
-            || mouseEvent.getY() >= getHeight()
-            || mouseEvent.getX() < 0
-            || mouseEvent.getX() >= getWidth())
-            && mouseEvent.getButton() == MouseEvent::LEFT
-            && isModalMouseInputFocused())
-        {
-            releaseModalMouseInputFocus();
-
-            if (mIsDragged)
-                foldUp();
-        }
-        else if (mouseEvent.getButton() == MouseEvent::LEFT)
-        {
-            mPushed = false;
-        }
-
-        mIsDragged = false;
-    }
-
-    void DropDown::mouseDragged(MouseEvent& mouseEvent)
-    {
-        mIsDragged = true;
-
-        mouseEvent.consume();
-    }
-
-    void DropDown::setListModel(ListModel *listModel)
-    {
-        mListBox->setListModel(listModel);
-
-        if (mListBox->getSelected() < 0)
-            mListBox->setSelected(0);
-
-        adjustHeight();
-    }
-
-    ListModel *DropDown::getListModel()
-    {
-        return mListBox->getListModel();
-    }
-
-    void DropDown::adjustHeight()
-    {
-    }
-
-    void DropDown::dropDown()
-    {
-        if (!mDroppedDown)
-        {
-            mDroppedDown = true;
-            mFoldedUpHeight = getHeight();
-            adjustHeight();
-
-            if (getParent())
-                getParent()->moveToTop(this);
-        }
-
-        mListBox->requestFocus();
-    }
-
-    void DropDown::foldUp()
-    {
-        if (mDroppedDown)
-        {
-            mDroppedDown = false;
-            adjustHeight();
-            mInternalFocusHandler.focusNone();
-        }
-    }
-
-    void DropDown::focusLost(const Event& event A_UNUSED)
-    {
-        foldUp();
-        mInternalFocusHandler.focusNone();
-    }
-
-
-    void DropDown::death(const Event& event)
-    {
-        if (event.getSource() == mScrollArea)
-            mScrollArea = nullptr;
-
-        BasicContainer::death(event);
-    }
-
-    void DropDown::action(const ActionEvent& actionEvent A_UNUSED)
-    {
-        foldUp();
-        releaseModalMouseInputFocus();
-        distributeActionEvent();
-    }
-
-    Rectangle DropDown::getChildrenArea()
-    {
-        if (mDroppedDown)
-        {
-            // Calculate the children area (with the one pixel border in mind)
-            return Rectangle(1, mFoldedUpHeight + 1, 
-                getWidth() - 2, getHeight() - mFoldedUpHeight - 2);
-        }
-
-        return Rectangle();
-    }
-
-    void DropDown::setBaseColor(const Color& color)
-    {
-        if (mInternalScrollArea)
-            mScrollArea->setBaseColor(color);
-
-        if (mInternalListBox)
-            mListBox->setBaseColor(color);
-
-        Widget::setBaseColor(color);
-    }
-
-    void DropDown::setBackgroundColor(const Color& color)
-    {
-        if (mInternalScrollArea)
-            mScrollArea->setBackgroundColor(color);
-
-        if (mInternalListBox)
-            mListBox->setBackgroundColor(color);
-
-        Widget::setBackgroundColor(color);
-    }
-
-    void DropDown::setForegroundColor(const Color& color)
-    {
-        if (mInternalScrollArea)
-            mScrollArea->setForegroundColor(color);
-
-        if (mInternalListBox)
-            mListBox->setForegroundColor(color);
-
-        Widget::setForegroundColor(color);
-    }
-
-    void DropDown::setFont(Font *font)
-    {
-        if (mInternalScrollArea)
-            mScrollArea->setFont(font);
-
-        if (mInternalListBox)
-            mListBox->setFont(font);
-
-        Widget::setFont(font);
-    }
-
-    void DropDown::mouseWheelMovedUp(MouseEvent& mouseEvent)
-    {
-        if (isFocused() && mouseEvent.getSource() == this)
-        {
-            mouseEvent.consume();
-
-            if (mListBox->getSelected() > 0)
-                mListBox->setSelected(mListBox->getSelected() - 1);
-        }
-    }
-
-    void DropDown::mouseWheelMovedDown(MouseEvent& mouseEvent)
-    {
-        if (isFocused() && mouseEvent.getSource() == this)
-        {
-            mouseEvent.consume();
-
-            mListBox->setSelected(mListBox->getSelected() + 1);
-        }
-    }
-
-    void DropDown::setSelectionColor(const Color& color)
-    {
-        Widget::setSelectionColor(color);
-
-        if (mInternalListBox)
-            mListBox->setSelectionColor(color);
-    }
-
-    void DropDown::valueChanged(const SelectionEvent& event A_UNUSED)
-    {
-        distributeValueChangedEvent();
-    }
-
-    void DropDown::addSelectionListener(SelectionListener* selectionListener)
-    {
-        mSelectionListeners.push_back(selectionListener);
-    }
-
-    void DropDown::removeSelectionListener(SelectionListener* listener)
-    {
-        mSelectionListeners.remove(listener);
-    }
-
-    void DropDown::distributeValueChangedEvent()
-    {
-        for (SelectionListenerIterator iter = mSelectionListeners.begin();
-             iter != mSelectionListeners.end(); 
-             ++iter)
-        {
-            SelectionEvent event(this);
-            (*iter)->valueChanged(event);
-        }
-    }
-}