Merge lp:~mandel/unity/add-text-entry into lp:unity

[Manuel de la Peña]

- Add a text entry ui element that follows the design from the search bar so that previews can get input form the users (lp: #1063735).

- Add a text entry ui element that follows the design from the search bar so that previews can get input form the users (lp: #1063735).

[Nick Dedekind (nick-dedekind)]

Havent finished looking at it, but here are a few points I have so far.

53 +const int LIVE_SEARCH_TIMEOUT = 40;
55 +const int SPACE_BETWEEN_SPINNER_AND_TEXT = 5;
58 +const int SEARCH_ENTRY_RIGHT_BORDER = 10;

This isn't a search bar, and there is no spinner.

120 +TextInput::TextInput(NUX_FILE_LINE_DECL)
121 + : View(NUX_FILE_LINE_PARAM)
122 + , input_hint("")
123 + , last_width_(-1)
124 + , last_height_(-1)
125 +{
126 + Init();
127 +}
128 +
129 +TextInput::TextInput(bool show_filter_hint_, NUX_FILE_LINE_DECL)
130 + : View(NUX_FILE_LINE_PARAM)
131 + , input_hint("")
132 + , last_width_(-1)
133 + , last_height_(-1)

Not initialising the show_filter_hint_ member

174 + OnFontChanged(gtk_settings_get_default())

If you're not going to have a connection to the gtk font change signal, then it probably shouldn't be called OnFontChanged. Also, why no connection to gtk font update signal?

review: Needs Fixing

[Manuel de la Peña (mandel)]

> Havent finished looking at it, but here are a few points I have so far.
>
> 53 +const int LIVE_SEARCH_TIMEOUT = 40;
> 55 +const int SPACE_BETWEEN_SPINNER_AND_TEXT = 5;
> 58 +const int SEARCH_ENTRY_RIGHT_BORDER = 10;
>

Nice catch, I started based on the search bar and forgot to clean up those.

> This isn't a search bar, and there is no spinner.
>
> 120 +TextInput::TextInput(NUX_FILE_LINE_DECL)
> 121 + : View(NUX_FILE_LINE_PARAM)
> 122 + , input_hint("")
> 123 + , last_width_(-1)
> 124 + , last_height_(-1)
> 125 +{
> 126 + Init();
> 127 +}
> 128 +
> 129 +TextInput::TextInput(bool show_filter_hint_, NUX_FILE_LINE_DECL)
> 130 + : View(NUX_FILE_LINE_PARAM)
> 131 + , input_hint("")
> 132 + , last_width_(-1)
> 133 + , last_height_(-1)
>
> Not initialising the show_filter_hint_ member
>

Doing it.

> 174 + OnFontChanged(gtk_settings_get_default())
>
> If you're not going to have a connection to the gtk font change signal, then
> it probably shouldn't be called OnFontChanged. Also, why no connection to gtk
> font update signal?

Mistake in my part, connecting to the gtk signal is the way to go

[Manuel de la Peña (mandel)]

> > Havent finished looking at it, but here are a few points I have so far.
> >
> > 53 +const int LIVE_SEARCH_TIMEOUT = 40;
> > 55 +const int SPACE_BETWEEN_SPINNER_AND_TEXT = 5;
> > 58 +const int SEARCH_ENTRY_RIGHT_BORDER = 10;
> >
>
> Nice catch, I started based on the search bar and forgot to clean up those.
>
> > This isn't a search bar, and there is no spinner.
> >
> > 120 +TextInput::TextInput(NUX_FILE_LINE_DECL)
> > 121 + : View(NUX_FILE_LINE_PARAM)
> > 122 + , input_hint("")
> > 123 + , last_width_(-1)
> > 124 + , last_height_(-1)
> > 125 +{
> > 126 + Init();
> > 127 +}
> > 128 +
> > 129 +TextInput::TextInput(bool show_filter_hint_, NUX_FILE_LINE_DECL)
> > 130 + : View(NUX_FILE_LINE_PARAM)
> > 131 + , input_hint("")
> > 132 + , last_width_(-1)
> > 133 + , last_height_(-1)
> >
> > Not initialising the show_filter_hint_ member
> >
>
> Doing it.
>
> > 174 + OnFontChanged(gtk_settings_get_default())
> >
> > If you're not going to have a connection to the gtk font change signal, then
> > it probably shouldn't be called OnFontChanged. Also, why no connection to
> gtk
> > font update signal?
>
> Mistake in my part, connecting to the gtk signal is the way to go

Everything has been fixed in the latest version.

[Andrea Azzarone (azzar1)]

In this way there is a lot of code duplication in SearchBar and TextInput. In some ways we can avoid this. What do you think?

[Manuel de la Peña (mandel)]

> In this way there is a lot of code duplication in SearchBar and TextInput. In
> some ways we can avoid this. What do you think?

I'm more than happy to re-factor the code, but is that something that all agree with? Bare in mind that there is a number of important differences between the two of them:

* timer for the searches
* spinner
* search icon (the magnifier)

We can surely make the text entry be flexible enough to be able to be hooked with signals that can be used for the searches and the timer. I'm not that sure about the changes to be done in the layout to accommodate the spinner and the icon.

[Omer Akram (om26er)]

19 + * Copyright (C) 2010-2011 Canonical Ltd
400 + * Copyright (C) 2010 Canonical Ltd

wrong years ?

33 + * Authored by: Manuel de la Pena

please add <email address hidden> as well.

[Manuel de la Peña (mandel)]

> 19 + * Copyright (C) 2010-2011 Canonical Ltd
> 400 + * Copyright (C) 2010 Canonical Ltd
>
> wrong years ?
>
> 33 + * Authored by: Manuel de la Pena
>
> please add <email address hidden> as well.
Fix, sorry I yy the headers.

[Andrea Azzarone (azzar1)]

> > In this way there is a lot of code duplication in SearchBar and TextInput.
> In
> > some ways we can avoid this. What do you think?
>
> I'm more than happy to re-factor the code, but is that something that all
> agree with? Bare in mind that there is a number of important differences
> between the two of them:
>
> * timer for the searches
> * spinner
> * search icon (the magnifier)
>
> We can surely make the text entry be flexible enough to be able to be hooked
> with signals that can be used for the searches and the timer. I'm not that
> sure about the changes to be done in the layout to accommodate the spinner and
> the icon.

Ok never mind ;) Will be done later.

[Nick Dedekind (nick-dedekind)]

Still a reference to SPACE_BETWEEN_SPINNER_AND_TEXT

203 + gchar* tmp = g_markup_escape_text(input_hint().c_str(), -1);
204 +
205 + hint_->SetText(tmp);
206 +
207 + g_free(tmp);

not wrong, but you should use glib::String since we have it.

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

137 + entry_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);

only one item in this layout, so you shouldnt actually need it.

[Nick Dedekind (nick-dedekind)]

LGTM.

review: Approve

[Didier Roche-Tolomelli (didrocks)]

I don't see any test on it?

[Manuel de la Peña (mandel)]

Indeed, I really don't know how to test this thing... if you point me to an example I can always take a look and add them in a following branch.

[Marco Trevisan (Treviño) (3v1n0)]

Manuel, just give a look to the tests we alredy have in the tests subfolder (also give a look to test_im_text_entry.cpp, it should be good as a base); I think you sould basically try to test any new method you've added.

[Didier Roche-Tolomelli (didrocks)]

You can ask to other unity-team members for how to use unit tests. I think that mmrazik and his team will be able to help you as well (there are quite a lot of tests in the unity trunk itself.

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2012-10-11 11:04:13 +0000
+++ unity-shared/CMakeLists.txt	2012-10-17 10:34:19 +0000
@@ -53,6 +53,7 @@
      SearchBarSpinner.cpp
      StaticCairoText.cpp
      TextureCache.cpp
+     TextInput.cpp
      TextureThumbnailProvider.cpp
      ThumbnailGenerator.cpp
      Timer.cpp
 
=== added file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/TextInput.cpp	2012-10-17 10:34:19 +0000
@@ -0,0 +1,366 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 detais.
+ *
+ * You shoud have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Manuel de la Pena <[e-mail]>
+ */
+
+#include "config.h"
+
+#include <Nux/Nux.h>
+#include <Nux/HLayout.h>
+#include <Nux/VLayout.h>
+#include <NuxCore/Logger.h>
+
+#include <UnityCore/Variant.h>
+
+#include <glib/gi18n-lib.h>
+
+#include "TextInput.h"
+#include "CairoTexture.h"
+
+namespace
+{
+const float kExpandDefaultIconOpacity = 1.0f;
+
+const int SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT = 10;
+const int LEFT_INTERNAL_PADDING = 6;
+const int TEXT_INPUT_RIGHT_BORDER = 10;
+
+const int HIGHLIGHT_HEIGHT = 24;
+
+// Fonts
+const std::string HINT_LABEL_FONT_SIZE = "12px";
+const std::string HINT_LABEL_FONT_STYLE = "Italic";
+const std::string HINT_LABEL_DEFAULT_FONT = "Ubuntu " + HINT_LABEL_FONT_STYLE + " " + HINT_LABEL_FONT_SIZE;
+
+const std::string PANGO_ENTRY_DEFAULT_FONT_FAMILY = "Ubuntu";
+const int PANGO_ENTRY_FONT_SIZE = 14;
+
+}
+
+namespace
+{
+
+nux::logging::Logger logger("unity");
+
+class ExpanderView : public nux::View
+{
+public:
+  ExpanderView(NUX_FILE_LINE_DECL)
+   : nux::View(NUX_FILE_LINE_PARAM)
+  {
+    SetAcceptKeyNavFocusOnMouseDown(false);
+    SetAcceptKeyNavFocusOnMouseEnter(true);
+  }
+
+protected:
+  void Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
+  {}
+
+  void DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
+  {
+    if (GetLayout())
+      GetLayout()->ProcessDraw(graphics_engine, force_draw);
+  }
+
+  bool AcceptKeyNavFocus()
+  {
+    return true;
+  }
+
+  nux::Area* FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type)
+  {
+    bool mouse_inside = TestMousePointerInclusionFilterMouseWheel(mouse_position, event_type);
+
+    if (mouse_inside == false)
+      return nullptr;
+
+    return this;
+  }
+};
+
+}
+
+namespace unity
+{
+
+NUX_IMPLEMENT_OBJECT_TYPE(TextInput);
+
+TextInput::TextInput(NUX_FILE_LINE_DECL)
+  : View(NUX_FILE_LINE_PARAM)
+  , input_hint("")
+  , last_width_(-1)
+  , last_height_(-1)
+{
+  Init();
+}
+
+void TextInput::Init()
+{
+  bg_layer_.reset(new nux::ColorLayer(nux::Color(0xff595853), true));
+
+  layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
+  layout_->SetLeftAndRightPadding(LEFT_INTERNAL_PADDING, TEXT_INPUT_RIGHT_BORDER);
+  layout_->SetSpaceBetweenChildren(SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT);
+  SetLayout(layout_);
+
+  nux::HLayout* hint_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
+
+  hint_ = new nux::StaticCairoText(" ");
+  hint_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 0.5f));
+  hint_->SetFont(HINT_LABEL_DEFAULT_FONT.c_str());
+  hint_layout->AddView(hint_,  0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+
+  pango_entry_ = new IMTextEntry();
+  pango_entry_->SetFontFamily(PANGO_ENTRY_DEFAULT_FONT_FAMILY.c_str());
+  pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE);
+  pango_entry_->cursor_moved.connect([&](int i) { QueueDraw(); });
+  pango_entry_->mouse_down.connect(sigc::mem_fun(this, &TextInput::OnMouseButtonDown));
+  pango_entry_->end_key_focus.connect(sigc::mem_fun(this, &TextInput::OnEndKeyFocus));
+
+  layered_layout_ = new nux::LayeredLayout();
+  layered_layout_->AddLayout(hint_layout);
+  layered_layout_->AddLayer(pango_entry_);
+  layered_layout_->SetPaintAll(true);
+  layered_layout_->SetActiveLayerN(1);
+  layout_->AddView(layered_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
+
+  sig_manager_.Add<void, GtkSettings*, GParamSpec*>(gtk_settings_get_default(),
+    "notify::gtk-font-name", sigc::mem_fun(this, &TextInput::OnFontChanged));
+  OnFontChanged(gtk_settings_get_default());
+
+  input_string.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_input_string));
+  input_string.SetSetterFunction(sigc::mem_fun(this, &TextInput::set_input_string));
+  im_active.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_im_active));
+  im_preedit.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_im_preedit));
+  input_hint.changed.connect([&](std::string const& s) { OnInputHintChanged(); });
+
+}
+
+void TextInput::OnFontChanged(GtkSettings* settings, GParamSpec* pspec)
+{
+  glib::String font_name;
+  PangoFontDescription* desc;
+  std::ostringstream font_desc;
+
+  g_object_get(settings, "gtk-font-name", &font_name, NULL);
+
+  desc = pango_font_description_from_string(font_name.Value());
+  if (desc)
+  {
+    pango_entry_->SetFontFamily(pango_font_description_get_family(desc));
+    pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE);
+    pango_entry_->SetFontOptions(gdk_screen_get_font_options(gdk_screen_get_default()));
+
+    font_desc << pango_font_description_get_family(desc) << " " << HINT_LABEL_FONT_STYLE << " " << HINT_LABEL_FONT_SIZE;
+    hint_->SetFont(font_desc.str().c_str());
+
+    font_desc.str("");
+    font_desc.clear();
+
+    pango_font_description_free(desc);
+  }
+}
+
+void TextInput::OnInputHintChanged()
+{
+  glib::String tmp(g_markup_escape_text(input_hint().c_str(), -1));
+  hint_->SetText(tmp);
+}
+
+void TextInput::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  nux::Geometry const& base = GetGeometry();
+
+  UpdateBackground(false);
+
+  GfxContext.PushClippingRectangle(base);
+  nux::GetPainter().PaintBackground(GfxContext, base);
+
+  bg_layer_->SetGeometry(nux::Geometry(base.x, base.y, last_width_, last_height_));
+  nux::GetPainter().RenderSinglePaintLayer(GfxContext,
+                                           bg_layer_->GetGeometry(),
+                                           bg_layer_.get());
+
+  GfxContext.PopClippingRectangle();
+}
+
+void TextInput::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  nux::Geometry const& geo = GetGeometry();
+
+  GfxContext.PushClippingRectangle(geo);
+
+  if (highlight_layer_ && ShouldBeHighlighted() && !IsFullRedraw())
+  {
+    nux::GetPainter().PushLayer(GfxContext, highlight_layer_->GetGeometry(), highlight_layer_.get());
+  }
+
+
+  if (!IsFullRedraw())
+  {
+    gPainter.PushLayer(GfxContext, bg_layer_->GetGeometry(), bg_layer_.get());
+  }
+  else
+  {
+    nux::GetPainter().PushPaintLayerStack();
+  }
+
+  layout_->ProcessDraw(GfxContext, force_draw);
+
+  if (!IsFullRedraw())
+  {
+    gPainter.PopBackground();
+  }
+  else
+  {
+    nux::GetPainter().PopPaintLayerStack();
+  }
+
+  GfxContext.PopClippingRectangle();
+}
+
+void TextInput::UpdateBackground(bool force)
+{
+  int RADIUS = 5;
+  nux::Geometry geo(GetGeometry());
+  geo.width = layered_layout_->GetAbsoluteX() +
+              layered_layout_->GetAbsoluteWidth() -
+              GetAbsoluteX() +
+              TEXT_INPUT_RIGHT_BORDER;
+
+  LOG_DEBUG(logger) << "height: "
+  << geo.height << " - "
+  << layered_layout_->GetGeometry().height << " - "
+  << pango_entry_->GetGeometry().height;
+
+  if (geo.width == last_width_
+      && geo.height == last_height_
+      && force == false)
+    return;
+
+  last_width_ = geo.width;
+  last_height_ = geo.height;
+
+  nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, last_width_, last_height_);
+  cairo_t* cr = cairo_graphics.GetContext();
+
+  cairo_graphics.DrawRoundedRectangle(cr,
+                                      1.0f,
+                                      0.5, 0.5,
+                                      RADIUS,
+                                      last_width_ - 1, last_height_ - 1,
+                                      false);
+
+  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.35f);
+  cairo_fill_preserve(cr);
+  cairo_set_line_width(cr, 1);
+  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 0.7f);
+  cairo_stroke(cr);
+
+  cairo_destroy(cr);
+  nux::BaseTexture* texture2D = texture_from_cairo_graphics(cairo_graphics);
+
+  nux::TexCoordXForm texxform;
+  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+
+  nux::ROPConfig rop;
+  rop.Blend = true;
+  rop.SrcBlend = GL_ONE;
+  rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+  bg_layer_.reset(new nux::TextureLayer(texture2D->GetDeviceTexture(),
+                                        texxform,
+                                        nux::color::White,
+                                        true,
+                                        rop));
+
+  texture2D->UnReference();
+}
+
+void TextInput::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
+{
+  hint_->SetVisible(false);
+}
+
+void TextInput::OnEndKeyFocus()
+{
+  hint_->SetVisible(input_string().empty());
+}
+
+
+nux::TextEntry* TextInput::text_entry() const
+{
+  return pango_entry_;
+}
+
+std::string TextInput::get_input_string() const
+{
+  return pango_entry_->GetText();
+}
+
+bool TextInput::set_input_string(std::string const& string)
+{
+  pango_entry_->SetText(string.c_str());
+  return true;
+}
+
+bool TextInput::get_im_active() const
+{
+  return pango_entry_->im_active();
+}
+
+bool TextInput::get_im_preedit() const
+{
+  return pango_entry_->im_preedit();
+}
+
+//
+// Highlight
+//
+bool TextInput::ShouldBeHighlighted()
+{
+  return true;
+}
+
+//
+// Key navigation
+//
+bool TextInput::AcceptKeyNavFocus()
+{
+  return false;
+}
+
+//
+// Introspection
+//
+std::string TextInput::GetName() const
+{
+  return "TextInput";
+}
+
+void TextInput::AddProperties(GVariantBuilder* builder)
+{
+  unity::variant::BuilderWrapper(builder)
+  .add(GetAbsoluteGeometry())
+  .add("has_focus", pango_entry_->HasKeyFocus())
+  .add("input_string", pango_entry_->GetText())
+  .add("im_active", pango_entry_->im_active());
+}
+
+} // namespace unity
 
=== added file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	1970-01-01 00:00:00 +0000
+++ unity-shared/TextInput.h	2012-10-17 10:34:19 +0000
@@ -0,0 +1,102 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Manuel de la Pena <[e-mail]>
+ */
+
+#ifndef TEXTINPUT_H
+#define TEXTINPUT_H
+
+#include <gtk/gtk.h>
+#include <NuxCore/Property.h>
+#include <Nux/LayeredLayout.h>
+#include <Nux/VLayout.h>
+#include <Nux/TextEntry.h>
+#include <UnityCore/GLibSignal.h>
+#include <UnityCore/GLibSource.h>
+
+#include "unity-shared/IconTexture.h"
+#include "unity-shared/IMTextEntry.h"
+#include "unity-shared/Introspectable.h"
+#include "unity-shared/StaticCairoText.h"
+
+namespace nux
+{
+class AbstractPaintLayer;
+class LinearLayout;
+}
+
+namespace unity
+{
+
+class TextInput : public unity::debug::Introspectable, public nux::View
+{
+  NUX_DECLARE_OBJECT_TYPE(TextInput, nux::View);
+public:
+  typedef nux::ObjectPtr<TextInput> Ptr;
+  TextInput(NUX_FILE_LINE_PROTO);
+  TextInput(bool show_filter_hint, NUX_FILE_LINE_PROTO);
+
+  nux::TextEntry* text_entry() const;
+
+  nux::RWProperty<std::string> input_string;
+  nux::Property<std::string> input_hint;
+  nux::ROProperty<bool> im_active;
+  nux::ROProperty<bool> im_preedit;
+
+private:
+
+  void Init();
+
+  void OnFontChanged(GtkSettings* settings, GParamSpec* pspec=NULL);
+  void OnInputHintChanged();
+
+  void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+  void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+
+  void OnMouseButtonDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
+  void OnEndKeyFocus();
+
+  void UpdateBackground(bool force);
+
+  std::string get_input_string() const;
+  bool set_input_string(std::string const& string);
+  bool get_im_active() const;
+  bool get_im_preedit() const;
+
+  std::string GetName() const;
+  void AddProperties(GVariantBuilder* builder);
+  bool AcceptKeyNavFocus();
+
+private:
+  bool ShouldBeHighlighted();
+
+  std::unique_ptr<nux::AbstractPaintLayer> bg_layer_;
+  std::unique_ptr<nux::AbstractPaintLayer> highlight_layer_;
+  nux::HLayout* layout_;
+  nux::LayeredLayout* layered_layout_;
+  nux::StaticCairoText* hint_;
+  IMTextEntry* pango_entry_;
+
+  int last_width_;
+  int last_height_;
+
+  glib::SignalManager sig_manager_;
+};
+
+}
+
+#endif