Add close button to daily forecast dialog

Refs: #16

icons/meson.build

@@ -8,6 +8,7 @@ icons = files(
   'icon_11n_2x.bmp',
   'icon_13n_2x.bmp',
   'icon_50n_2x.bmp',
+  'icon_close.bmp',
   'icon_direction.bmp',
   'icon_display_settings.bmp',
   'icon_favorite.bmp',

src/closebutton.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <memory>
+
+#include "button.h"
+#include "icons.h"
+
+namespace taranis {
+
+class CloseButton : public Button {
+public:
+  CloseButton(int icon_size, std::shared_ptr<Icons> icons)
+      : Button{icon_size, icons->get("close")} {}
+
+  typedef std::function<void()> ClickHandler;
+
+  void set_click_handler(ClickHandler handler) {
+    this->click_handler = handler;
+  }
+
+protected:
+  void on_clicked() override {
+    if (!this->click_handler) {
+      return;
+    }
+    this->click_handler();
+  }
+
+private:
+  ClickHandler click_handler;
+};
+} // namespace taranis

src/dailyforecastviewer.cc

@@ -82,6 +82,20 @@ void DailyForecastViewer::do_paint() {
       this->get_width() - 2 * DailyForecastViewer::horizontal_padding,
       HORIZONTAL_SEPARATOR_SOLID);
 
+  if (!this->close_button) {
+    const auto close_button_icon_size =
+        bold_font->height + DailyForecastViewer::vertical_padding;
+
+    this->close_button =
+        std::make_shared<CloseButton>(close_button_icon_size, this->icons);
+    this->close_button->set_click_handler(
+        std::bind(&DailyForecastViewer::hide, this));
+    this->close_button->set_pos_x(this->get_width() - close_button_icon_size);
+    this->close_button->set_pos_y(this->get_pos_y() +
+                                  DailyForecastViewer::vertical_padding / 4);
+  }
+  this->close_button->do_paint();
+
   // forecast
   SetFont(default_font.get(), BLACK);
 
@@ -372,6 +386,12 @@ int DailyForecastViewer::handle_pointer_event(int event_type, int pointer_pos_x,
       return 1;
     }
   }
+  if (this->close_button and
+      this->close_button->is_in_bouding_box(pointer_pos_x, pointer_pos_y) and
+      this->close_button->is_enabled()) {
+    return this->close_button->handle_pointer_event(event_type, pointer_pos_x,
+                                                    pointer_pos_y);
+  }
   return 0;
 }
 

src/dailyforecastviewer.h

@@ -1,17 +1,21 @@
 #pragma once
 
 #include <boost/variant.hpp>
+#include <functional>
 #include <inkview.h>
 #include <memory>
 #include <tuple>
 #include <vector>
 
+#include "button.h"
+#include "closebutton.h"
 #include "fonts.h"
 #include "icons.h"
 #include "model.h"
 #include "widget.h"
 
 namespace taranis {
+
 class DailyForecastViewer : public ModalWidget {
 public:
   DailyForecastViewer(std::shared_ptr<Model> model,
@@ -39,6 +43,8 @@ class DailyForecastViewer : public ModalWidget {
   std::shared_ptr<Icons> icons;
   std::shared_ptr<Fonts> fonts;
 
+  std::shared_ptr<CloseButton> close_button;
+
   size_t forecast_index{0};
 
   const ibitmap *const direction_icon;

src/icons.h

@@ -15,6 +15,7 @@ extern const ibitmap icon_10n_2x;
 extern const ibitmap icon_11n_2x;
 extern const ibitmap icon_13n_2x;
 extern const ibitmap icon_50n_2x;
+extern const ibitmap icon_close;
 extern const ibitmap icon_direction;
 extern const ibitmap icon_display_settings;
 extern const ibitmap icon_favorite;
@@ -64,6 +65,9 @@ class Icons {
     if (name == "50d" or name == "50n") {
       return const_cast<ibitmap *>(&icon_50n_2x);
     }
+    if (name == "close") {
+      return const_cast<ibitmap *>(&icon_close);
+    }
     if (name == "direction") {
       return const_cast<ibitmap *>(&icon_direction);
     }