Focus entry widget on touch press

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

diff --git a/source/entry.h b/source/entry.h
index 968e3994580b042e35d19c3a4813ec5c6fcc1ec0..a3b160735b61ad22b31704296db48ff9c71b5d70 100644 (file)
--- a/source/entry.h
+++ b/source/entry.h
@@ -22,48 +22,64 @@ Special parts:
 class Entry: virtual public Widget, private Container
 {
 public:
-       class Loader: public Widget::Loader
+       class Loader: public DataFile::DerivedObjectLoader<Entry, Widget::Loader>
        {
        public:
                Loader(Entry &);
+
+       private:
+               void multiline(bool);
        };
 
+       // Deprecated
        sigc::signal<void> signal_enter;
 
 private:
        Text text;
        bool multiline;
+       unsigned edit_width;
+       unsigned edit_height;
        unsigned edit_pos;
        unsigned first_row;
        unsigned visible_rows;
        const Part *text_part;
        VSlider *slider;
+       bool got_key_press;
 
 public:
        Entry(const std::string & = std::string());
 
        virtual const char *get_class() const { return "entry"; }
 
-       virtual void autosize();
+private:
+       virtual void autosize_special(const Part &, Geometry &) const;
 
+public:
        void set_text(const std::string &);
        const std::string &get_text() const { return text.get(); }
+
+       /** Sets the minimum size of the editing area, in characters and rows.  This
+       only affects autosizing. */
+       void set_edit_size(unsigned w, unsigned h);
+
        void set_multiline(bool);
        bool is_multiline() const { return multiline; }
 
 private:
-       virtual void rebuild_special(const Part &, CachedPart &);
-       virtual void render_special(const Part &) const;
+       virtual void rebuild_special(const Part &);
+       virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
-       virtual void key_press(unsigned, unsigned);
-       virtual void character(wchar_t);
+       virtual void touch_press(int, int, unsigned);
+       virtual bool key_press(unsigned, unsigned);
+       virtual bool character(wchar_t);
+       virtual void focus_out();
+       virtual bool navigate(Navigation);
 private:
        virtual void on_geometry_change();
        virtual void on_style_change();
 
        void set_edit_position(unsigned);
-       void reposition_slider();
        void check_view_range();
        void slider_value_changed(double);
 };