Merge branch 'master' into stable

1 files changed, 113 insertions, 5 deletions

diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index c6e431634..6f0c192c6 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -20,22 +20,63 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * 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 "gui/widgets/listbox.h"
 
 #include "client.h"
 
-#include "events/keyevent.h"
-
 #include "input/keydata.h"
 
+#include "listeners/selectionlistener.h"
+
 #include "gui/focushandler.h"
 #include "gui/font.h"
 #include "gui/gui.h"
 
 #include "gui/models/listmodel.h"
 
-#include "render/graphics.h"
-
 #include "debug.h"
 
 float ListBox::mAlpha = 1.0;
@@ -43,7 +84,13 @@ float ListBox::mAlpha = 1.0;
 ListBox::ListBox(const Widget2 *const widget,
                  ListModel *const listModel,
                  const std::string &skin) :
-    gcn::ListBox(widget, listModel),
+    Widget(widget),
+    MouseListener(),
+    KeyListener(),
+    mSelected(-1),
+    mListModel(listModel),
+    mWrappingEnabled(false),
+    mSelectionListeners(),
     mHighlightColor(getThemeColor(Theme::HIGHLIGHT)),
     mForegroundSelectedColor(getThemeColor(Theme::LISTBOX_SELECTED)),
     mForegroundSelectedColor2(getThemeColor(Theme::LISTBOX_SELECTED_OUTLINE)),
@@ -56,6 +103,11 @@ ListBox::ListBox(const Widget2 *const widget,
     mDistributeMousePressed(true),
     mCenterText(false)
 {
+    setWidth(100);
+    setFocusable(true);
+    addMouseListener(this);
+    addKeyListener(this);
+
     mForegroundColor = getThemeColor(Theme::LISTBOX);
     mForegroundColor2 = getThemeColor(Theme::LISTBOX_OUTLINE);
 
@@ -313,3 +365,59 @@ int ListBox::getSelectionByMouse(const int y) const
         return -1;
     return (y - mPadding) / getRowHeight();
 }
+
+void ListBox::setSelected(const int selected)
+{
+    if (!mListModel)
+    {
+        mSelected = -1;
+    }
+    else
+    {
+        if (selected < 0)
+            mSelected = -1;
+        else if (selected >= mListModel->getNumberOfElements())
+            mSelected = mListModel->getNumberOfElements() - 1;
+        else
+            mSelected = selected;
+    }
+
+    Rect scroll;
+
+    if (mSelected < 0)
+        scroll.y = 0;
+    else
+        scroll.y = getRowHeight() * mSelected;
+
+    scroll.height = getRowHeight();
+    showPart(scroll);
+
+    distributeValueChangedEvent();
+}
+
+void ListBox::setListModel(ListModel *const listModel)
+{
+    mSelected = -1;
+    mListModel = listModel;
+    adjustSize();
+}
+
+void ListBox::addSelectionListener(SelectionListener *const selectionListener)
+{
+    mSelectionListeners.push_back(selectionListener);
+}
+
+void ListBox::removeSelectionListener(SelectionListener *const
+                                      selectionListener)
+{
+    mSelectionListeners.remove(selectionListener);
+}
+
+void ListBox::distributeValueChangedEvent()
+{
+    FOR_EACH (SelectionListenerIterator, iter, mSelectionListeners)
+    {
+        SelectionEvent event(this);
+        (*iter)->valueChanged(event);
+    }
+}