Focus entry widget on touch press

[libs/gltk.git] / source / entry.cpp

diff --git a/source/entry.cpp b/source/entry.cpp
index f21aacbd07beff04c64aae4be124bdfab4e138fd..8d3c47f82331ab5e3eb643b3e8af0f2941268b72 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -25,10 +25,11 @@ Entry::Entry(const string &t):
        slider(0),
        got_key_press(false)
 {
+       input_type = INPUT_TEXT;
        set_text(t);
 }
 
-void Entry::autosize_special(const Part &part, Geometry &ageom)
+void Entry::autosize_special(const Part &part, Geometry &ageom) const
 {
        if(part.get_name()=="text")
        {
@@ -47,21 +48,7 @@ void Entry::autosize_special(const Part &part, Geometry &ageom)
                        ageom.h = max(ageom.h, line_height+margin.top+margin.bottom);
        }
        else if(part.get_name()=="slider" && multiline)
-       {
-               Geometry sgeom = part.get_geometry();
-               if(!sgeom.w || !sgeom.h)
-               {
-                       slider->autosize();
-                       if(!sgeom.w)
-                               sgeom.w = slider->get_geometry().w;
-                       if(!sgeom.h)
-                               sgeom.h = slider->get_geometry().h;
-               }
-
-               const Sides &margin = part.get_margin();
-               ageom.w = max(ageom.w, sgeom.w+margin.left+margin.right);
-               ageom.h = max(ageom.h, sgeom.h+margin.top+margin.bottom);
-       }
+               autosize_child(*slider, part, ageom);
 }
 
 void Entry::set_text(const string &t)
@@ -93,7 +80,7 @@ void Entry::set_multiline(bool m)
                        add(*slider);
                        slider->set_step(1);
                        slider->signal_value_changed.connect(sigc::mem_fun(this, &Entry::slider_value_changed));
-                       reposition_slider();
+                       rebuild();
                }
                check_view_range();
        }
@@ -121,6 +108,14 @@ void Entry::rebuild_special(const Part &part)
                bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
                graphic->build(part.get_geometry().w, part.get_geometry().h, bld);
        }
+       else if(part.get_name()=="slider")
+       {
+               if(multiline)
+               {
+                       reposition_child(*slider, part);
+                       Widget::rebuild_special(part);
+               }
+       }
        else
                Widget::rebuild_special(part);
 }
@@ -131,32 +126,17 @@ void Entry::render_special(const Part &part, GL::Renderer &renderer) const
                slider->render(renderer);
 }
 
-void Entry::key_press(unsigned key, unsigned)
+void Entry::touch_press(int x, int y, unsigned finger)
+{
+       if(finger==0)
+               set_focus();
+       Widget::touch_press(x, y, finger);
+}
+
+bool Entry::key_press(unsigned key, unsigned)
 {
        got_key_press = true;
-       if(key==Input::KEY_LEFT)
-       {
-               if(edit_pos>0)
-                       set_edit_position(edit_pos-1);
-       }
-       else if(key==Input::KEY_RIGHT)
-       {
-               if(edit_pos<text.size())
-                       set_edit_position(edit_pos+1);
-       }
-       else if(key==Input::KEY_DOWN && multiline)
-       {
-               unsigned row, col;
-               text.offset_to_coords(edit_pos, row, col);
-               set_edit_position(text.coords_to_offset(row+1, col));
-       }
-       else if(key==Input::KEY_UP && multiline)
-       {
-               unsigned row, col;
-               text.offset_to_coords(edit_pos, row, col);
-               set_edit_position(row>0 ? text.coords_to_offset(row-1, col) : 0);
-       }
-       else if(key==Input::KEY_BACKSPACE)
+       if(key==Input::KEY_BACKSPACE)
        {
                if(edit_pos>0)
                {
@@ -165,27 +145,29 @@ void Entry::key_press(unsigned key, unsigned)
                        rebuild();
                }
        }
-       else if(key==Input::KEY_ENTER)
+       else if(key==Input::KEY_ENTER && multiline)
        {
-               if(multiline)
-               {
-                       text.insert(edit_pos++, "\n");
-                       check_view_range();
-                       rebuild();
-               }
-               else
-                       signal_enter.emit();
+               text.insert(edit_pos++, "\n");
+               check_view_range();
+               rebuild();
        }
+       else
+               return false;
+
+       return true;
 }
 
-void Entry::character(wchar_t ch)
+bool Entry::character(wchar_t ch)
 {
        if(got_key_press && ch>=' ')
        {
                text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
                ++edit_pos;
                rebuild();
+               return true;
        }
+
+       return false;
 }
 
 void Entry::focus_out()
@@ -194,10 +176,40 @@ void Entry::focus_out()
        got_key_press = false;
 }
 
-void Entry::on_geometry_change()
+bool Entry::navigate(Navigation nav)
 {
-       reposition_slider();
+       if(nav==NAV_LEFT)
+       {
+               if(edit_pos>0)
+                       set_edit_position(edit_pos-1);
+       }
+       else if(nav==NAV_RIGHT)
+       {
+               if(edit_pos<text.size())
+                       set_edit_position(edit_pos+1);
+       }
+       else if(nav==NAV_DOWN && multiline)
+       {
+               unsigned row, col;
+               text.offset_to_coords(edit_pos, row, col);
+               set_edit_position(text.coords_to_offset(row+1, col));
+       }
+       else if(nav==NAV_UP && multiline)
+       {
+               unsigned row, col;
+               text.offset_to_coords(edit_pos, row, col);
+               set_edit_position(row>0 ? text.coords_to_offset(row-1, col) : 0);
+       }
+       else if(nav==NAV_ACCEPT && !signal_enter.empty())
+               signal_enter.emit();
+       else
+               return false;
+
+       return true;
+}
 
+void Entry::on_geometry_change()
+{
        if(multiline)
                check_view_range();
 }
@@ -214,8 +226,6 @@ void Entry::on_style_change()
 
        text_part = style->get_part("text");
 
-       reposition_slider();
-
        if(multiline)
                check_view_range();
 }
@@ -227,28 +237,6 @@ void Entry::set_edit_position(unsigned ep)
        rebuild();
 }
 
-void Entry::reposition_slider()
-{
-       if(!style || !slider)
-               return;
-
-       if(const Part *slider_part = style->get_part("slider"))
-       {
-               Geometry sgeom = slider_part->get_geometry();
-               if(!sgeom.w || !sgeom.h)
-               {
-                       slider->autosize();
-                       if(!sgeom.w)
-                               sgeom.w = slider->get_geometry().w;
-                       if(!sgeom.h)
-                               sgeom.h = slider->get_geometry().h;
-               }
-
-               slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin());
-               slider->set_geometry(sgeom);
-       }
-}
-
 void Entry::check_view_range()
 {
        if(!multiline || !text_part)