(WIP) Editor UI experiment

src/editor/button_widget.cpp

@@ -18,6 +18,8 @@
 
 #include "supertux/gameconfig.hpp"
 #include "supertux/globals.hpp"
+#include "supertux/resources.hpp"
+#include "util/log.hpp"
 #include "video/viewport.hpp"
 #include "video/video_system.hpp"
 
@@ -28,7 +30,9 @@ ButtonWidget::ButtonWidget(SpritePtr sprite, const Vector& pos,
                     static_cast<float>(m_sprite->get_height()))),
   m_grab(false),
   m_hover(false),
-  m_sig_click(std::move(sig_click))
+  m_sig_click(std::move(sig_click)),
+  m_mouse_pos(),
+  m_help_text()
 {
 }
 
@@ -39,7 +43,7 @@ ButtonWidget::draw(DrawingContext& context)
                                    LAYER_GUI-5);
 
   if (m_sprite) {
-    m_sprite->draw(context.color(), m_rect.p1(), LAYER_GUI-5);
+    m_sprite->draw_scaled(context.color(), m_rect.grown(-4.0f), LAYER_GUI - 5);
   }
 
   if (m_grab) {
@@ -49,6 +53,16 @@ ButtonWidget::draw(DrawingContext& context)
     context.color().draw_filled_rect(m_rect, g_config->editorhovercolor, 4.0f,
                                      LAYER_GUI-5);
   }
+
+  if (m_hover && !m_help_text.empty())
+  {
+    const auto& font = Resources::control_font;
+    const auto text_height = font->get_text_height(m_help_text);
+    const auto text_width = font->get_text_width(m_help_text);
+    const auto text_rect = Rectf(m_mouse_pos + Vector(32, 32), m_mouse_pos + Vector(32, 32) + Vector(text_width, text_height));
+    context.color().draw_filled_rect(text_rect, Color::BLACK, INT_MAX);
+    context.color().draw_text(font, m_help_text, m_mouse_pos + Vector(32, 32), FontAlignment::ALIGN_LEFT, INT_MAX);
+  }
 }
 
 void
@@ -71,10 +85,10 @@ ButtonWidget::on_mouse_button_up(const SDL_MouseButtonEvent& button)
 {
   if (button.button != SDL_BUTTON_LEFT) return false;
 
-  Vector mouse_pos = VideoSystem::current()->get_viewport().to_logical(button.x, button.y);
+  m_mouse_pos = VideoSystem::current()->get_viewport().to_logical(button.x, button.y);
 
   if (m_grab) {
-    if (m_rect.contains(mouse_pos)) {
+    if (m_rect.contains(m_mouse_pos)) {
       if (m_sig_click) {
         m_sig_click();
       }
@@ -92,9 +106,9 @@ ButtonWidget::on_mouse_button_down(const SDL_MouseButtonEvent& button)
 {
   if (button.button != SDL_BUTTON_LEFT) return false;
 
-  Vector mouse_pos = VideoSystem::current()->get_viewport().to_logical(button.x, button.y);
+  m_mouse_pos = VideoSystem::current()->get_viewport().to_logical(button.x, button.y);
 
-  if (m_rect.contains(mouse_pos)) {
+  if (m_rect.contains(m_mouse_pos)) {
     m_hover = true;
     m_grab = true;
     return true;
@@ -107,16 +121,35 @@ ButtonWidget::on_mouse_button_down(const SDL_MouseButtonEvent& button)
 bool
 ButtonWidget::on_mouse_motion(const SDL_MouseMotionEvent& motion)
 {
-  Vector mouse_pos = VideoSystem::current()->get_viewport().to_logical(motion.x, motion.y);
+  m_mouse_pos = VideoSystem::current()->get_viewport().to_logical(motion.x, motion.y);
 
   if (m_grab) {
-    m_hover = m_rect.contains(mouse_pos);
+    m_hover = m_rect.contains(m_mouse_pos);
     return true;
-  } else if (m_rect.contains(mouse_pos)) {
+  } else if (m_rect.contains(m_mouse_pos)) {
     m_hover = true;
     return false;
   } else {
     m_hover = false;
     return false;
   }
 }
+
+void
+ButtonWidget::set_sprite(SpritePtr sprite)
+{
+  m_sprite = std::move(sprite);
+  m_rect.set_size(sprite->get_width() * 1.0f, sprite->get_height() * 1.0f);
+}
+
+void
+ButtonWidget::set_sprite(const std::string& path)
+{
+  set_sprite(SpriteManager::current()->create(path));
+}
+
+void
+ButtonWidget::set_help_text(const std::string& help_text)
+{
+  m_help_text = help_text;
+}

src/editor/button_widget.hpp

@@ -44,14 +44,99 @@ class ButtonWidget : public Widget
   virtual bool on_mouse_button_down(const SDL_MouseButtonEvent& button) override;
   virtual bool on_mouse_motion(const SDL_MouseMotionEvent& motion) override;
 
+  void set_sprite(const std::string& path);
+  void set_sprite(SpritePtr sprite);
+
+  void set_help_text(const std::string& help_text);
+
 private:
   SpritePtr m_sprite;
   Rectf m_rect;
   bool m_grab;
   bool m_hover;
   std::function<void()> m_sig_click;
+  Vector m_mouse_pos;
+  std::string m_help_text;
 
 private:
   ButtonWidget(const ButtonWidget&) = delete;
   ButtonWidget& operator=(const ButtonWidget&) = delete;
 };
+
+class EditorToolbarButtonWidget : public ButtonWidget
+{
+public:
+  EditorToolbarButtonWidget(SpritePtr sprite, const Vector& pos, std::function<void()> m_sig_click = {}) :
+    ButtonWidget(std::move(sprite), pos, m_sig_click),
+    m_tile_mode_visible(true),
+    m_object_mode_visible(true),
+    m_visible(true)
+  {
+  }
+
+  EditorToolbarButtonWidget(const std::string& path, const Vector& pos, std::function<void()> callback = {}) :
+    ButtonWidget(SpriteManager::current()->create(path), pos, std::move(callback)),
+    m_tile_mode_visible(true),
+    m_object_mode_visible(true),
+    m_visible(true)
+  {
+  }
+
+  virtual void draw(DrawingContext& context) override
+  {
+    if (!get_visible())
+      return;
+
+    ButtonWidget::draw(context);
+  }
+
+  virtual void update(float dt_sec) override
+  {
+    if (!get_visible())
+      return;
+
+    ButtonWidget::update(dt_sec);
+  }
+
+  virtual bool on_mouse_button_up(const SDL_MouseButtonEvent& button) override
+  {
+    if (!get_visible())
+      return false;
+
+    return ButtonWidget::on_mouse_button_up(button);
+  }
+
+  virtual bool on_mouse_button_down(const SDL_MouseButtonEvent& button) override
+  {
+    if (!get_visible())
+      return false;
+
+    return ButtonWidget::on_mouse_button_down(button);
+  }
+
+  virtual bool on_mouse_motion(const SDL_MouseMotionEvent& motion) override
+  {
+    if (!get_visible())
+      return false;
+
+    return ButtonWidget::on_mouse_motion(motion);
+  }
+
+  void set_visible_in_tile_mode(bool visible) { m_tile_mode_visible = visible; }
+  bool get_visible_in_tile_mode() const { return m_tile_mode_visible; }
+
+  void set_visible_in_object_mode(bool visible) { m_object_mode_visible = visible; }
+  bool get_visible_in_object_mode() const { return m_object_mode_visible; } 
+
+  void set_visible(bool visible) { m_visible = visible; }
+  bool get_visible() const { return m_visible; }
+
+private:
+  bool m_tile_mode_visible;
+  bool m_object_mode_visible;
+  bool m_visible;
+
+private:
+  EditorToolbarButtonWidget(const EditorToolbarButtonWidget&) = delete;
+  EditorToolbarButtonWidget& operator=(const EditorToolbarButtonWidget&) = delete;
+};