X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fgui%2Fbutton.h;h=5a78d4592dee969703b05d4092cc19067d2a9d4b;hb=8e0bad9f82ccbc811a18edd7ce6c6f69c5bca082;hp=a24cc9d39d5a8bb4699922eba9d57290c459ce3c;hpb=9c511ea692d3a2339597211f08f18ea74fad35ec;p=supertux.git

diff --git a/lib/gui/button.h b/lib/gui/button.h
index a24cc9d39..5a78d4592 100644
--- a/lib/gui/button.h
+++ b/lib/gui/button.h
@@ -1,98 +1,92 @@
-//  $Id$
-//
-//  SuperTux
-//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
-//
-//  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 (at your option) 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, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+/***************************************************************************
+                          button.h  -  graphical buttons
+                             -------------------
+    begin                : June, 23 2004
+    copyright            : (C) 2004 by Ricardo Cruz
+    email                : rick2@aeiou.pt
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
 
 #ifndef SUPERTUX_BUTTON_H
 #define SUPERTUX_BUTTON_H
 
 #include <vector>
+#include <string>
 
-#include "video/surface.h"
-#include "special/timer.h"
-
-enum ButtonState {
-  BUTTON_NONE = -1,
-  BUTTON_CLICKED,
-  BUTTON_PRESSED,
-  BUTTON_HOVER,
-  BUTTON_WHEELUP,
-  BUTTON_WHEELDOWN,
-  BUTTON_DEACTIVE
-};
+#include "math/vector.h"
+#include "video/drawing_context.h"
+
+namespace SuperTux
+  {
+class Surface;
+class ButtonGroup;
 
-class ButtonPanel;
+enum {
+  BT_NONE,
+  BT_HOVER,
+  BT_SELECTED,
+  BT_SHOW_INFO
+  };
 
 class Button
 {
-  friend class ButtonPanel;
-
 public:
-  Button(Surface* icon_file, const std::string& info, SDLKey shortcut,
-      int x, int y, int mw = -1, int h = -1);
-  Button(const std::string& icon_name, const std::string& info, SDLKey shortcut,
-      int x, int y, int mw = -1, int h = -1);
-  
+  Button(Surface* image_, std::string info_, SDLKey binding_);
   ~Button();
-  void event(SDL_Event& event);
-  void draw(DrawingContext& context);
-  int get_state();
-  void set_active(bool active) { active ? state = BUTTON_NONE : state = BUTTON_DEACTIVE; };
-  void add_icon(const std::string& imagefile, int mw, int mh);
-  SDL_Rect get_pos() { return rect; }
-  int get_tag(){return tag; }
-//  void set_drawable(Drawable* newdrawable)
-//  { drawable = newdrawable; }
+  
+  void draw(DrawingContext& context, bool selected);
+  int event(SDL_Event& event, int x_offset = 0, int y_offset = 0);
+
+  static Font* info_font;
 
 private:
-  static Timer popup_timer;
-//  Drawable* drawable;
-  std::vector<Surface*> icon;
+  friend class ButtonGroup;
+
+  Vector pos, size;
+
+  Surface* image;
+  SDLKey binding;
+
+  int id;
+  int state;
   std::string info;
-  SDLKey shortcut;
-  SDL_Rect rect;
-  bool show_info;
-  ButtonState state;
-  int tag;
 };
 
-class ButtonPanel
+class ButtonGroup
 {
 public:
-  ButtonPanel(int x, int y, int w, int h);
-  ~ButtonPanel();
+  ButtonGroup(Vector pos_, Vector size_, Vector button_box_);
+  ~ButtonGroup();
+
   void draw(DrawingContext& context);
-  Button* event(SDL_Event &event);
-  void additem(Button* pbutton, int tag);
-  Button* button_panel_event(SDL_Event& event);
-  void set_button_size(int w, int h);
-  Button* manipulate_button(int i);
-  void highlight_last(bool b);
-  void set_last_clicked(unsigned int last)
-  { if(hlast) { if(item.size() >= last) { last_clicked = item.begin() + last; } } };
+  bool event(SDL_Event& event);
+
+  void add_button(Button button, int id, bool select = false);
+  void add_pair_of_buttons(Button button1, int id1, Button button2, int id2);
+  
+  int selected_id();
+  void set_unselected();
+  bool is_hover();
 
 private:
-  int bw, bh;
-  bool hlast;
-  bool hidden;
-  SDL_Rect rect;
-  std::vector<Button*> item;
-  std::vector<Button*>::iterator last_clicked;
+  Vector pos, buttons_size, buttons_box;
+  typedef std::vector <Button> Buttons;
+  Buttons buttons;
+
+  int button_selected, row;
+  bool mouse_hover, mouse_left_button;
+
+  int buttons_pair_nb;
 };
 
-#endif /*SUPERTUX_BUTTON_H*/
+} //namespace SuperTux
+
+#endif