Rename Widget::on_geometry_change to on_size_change

The new name better represents its actual function.

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index ef0fa22f97c8f150009988b3487c716b1e576cf2..f922001e2db0764c38000ec046bb9cd1c53150e4 100644 (file)
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -108,7 +108,7 @@ bool Dropdown::navigate(Navigation nav)
        return true;
 }
 
-void Dropdown::on_geometry_change()
+void Dropdown::on_size_change()
 {
        if(dropped)
                resize_list();

diff --git a/source/dropdown.h b/source/dropdown.h
index 9b8a9232e1d1b81be3f67f7662e4a2a548555804..2d3feb3ba236e314c4d767af0106a19575ae163e 100644 (file)
--- a/source/dropdown.h
+++ b/source/dropdown.h
@@ -60,7 +60,7 @@ public:
        virtual void button_press(int, int, unsigned);
        virtual bool navigate(Navigation);
 private:
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_style_change();
 
        void open_list();

diff --git a/source/entry.cpp b/source/entry.cpp
index 606f447b68c99ffdf8da7fce0495ed4709a73610..3a91f50dad4e4178cf308aa88c1a40c603559a68 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -369,7 +369,7 @@ void Entry::animate(const Time::TimeDelta &)
        rebuild();
 }
 
-void Entry::on_geometry_change()
+void Entry::on_size_change()
 {
        if(multiline)
                check_view_range();

diff --git a/source/entry.h b/source/entry.h
index 58e45fbc7ac5014cd1d7b343b955bdecc32dcf14..bd1fe2cf22a112a28021622281d54dbdf47e5900 100644 (file)
--- a/source/entry.h
+++ b/source/entry.h
@@ -95,7 +95,7 @@ public:
        virtual bool navigate(Navigation);
        virtual void animate(const Time::TimeDelta &);
 private:
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_style_change();
 
        void move_edit_position(Navigation, bool);

diff --git a/source/hslider.cpp b/source/hslider.cpp
index 2af6f5a4a71a621574e253c37ee802d3010979c2..1b6fadfcc653d5a340823e9b3fb5e1317c4f9808 100644 (file)
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -62,7 +62,7 @@ void HSlider::pointer_motion(int x, int)
                drag(x);
 }
 
-void HSlider::on_geometry_change()
+void HSlider::on_size_change()
 {
        drag_area_size = geom.w-total_margin;
 }
@@ -80,7 +80,7 @@ void HSlider::on_style_change()
                total_margin = margin.left+margin.right;
        }
 
-       on_geometry_change();
+       on_size_change();
 }
 
 } // namespace GLtk

diff --git a/source/hslider.h b/source/hslider.h
index 0d840fe961525ccab760bb9c9e4210a5ca6636a9..3784a7db7ff57b02f162cd5646dcf0fb58aa2ffe 100644 (file)
--- a/source/hslider.h
+++ b/source/hslider.h
@@ -29,7 +29,7 @@ public:
        virtual void button_release(int, int, unsigned);
        virtual void pointer_motion(int, int);
 private:
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_style_change();
 };
 

diff --git a/source/panel.cpp b/source/panel.cpp
index 11c19f3a99bb51415f2090a21c91ab1f8468c59d..c97cd6d7212da9c648cbed683edf23dad4250701 100644 (file)
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -176,7 +176,7 @@ int Panel::compute_delta(int pos, int dim, int origin_pos, int origin_dim, int n
                return 0;
 }
 
-void Panel::on_geometry_change()
+void Panel::on_size_change()
 {
        if(layout)
                layout->update();

diff --git a/source/panel.h b/source/panel.h
index 8881f8cb700adac60dfbff20b4336ae2dfe5df76..9d969ff4e5f6ddc7d4cd62ac01e9a67e5f17fb92 100644 (file)
--- a/source/panel.h
+++ b/source/panel.h
@@ -95,7 +95,7 @@ protected:
        Widget *find_next_child(int, int, int, int, int) const;
        static int compute_delta(int, int, int, int, int);
 
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_child_added(Widget &);
        virtual void on_child_removed(Widget &);
 };

diff --git a/source/root.cpp b/source/root.cpp
index a76da5b84cc6abcbe49f5ae99ccf35e8e6d47774..713477488a13ce6a5c2954c5daba94cc318ff487 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -297,9 +297,9 @@ void Root::update_camera()
        camera.set_orthographic(geom.w, geom.h);
 }
 
-void Root::on_geometry_change()
+void Root::on_size_change()
 {
-       Panel::on_geometry_change();
+       Panel::on_size_change();
        update_camera();
 }
 

diff --git a/source/root.h b/source/root.h
index 5de362619b02ddf03faba1300b4739830038428e..73ca276ed968a0e5241b5053c67ae89c96de39e6 100644 (file)
--- a/source/root.h
+++ b/source/root.h
@@ -79,7 +79,7 @@ private:
        void get_touch(unsigned, int &, int &);
        void update_camera();
 
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_child_added(Widget &);
 };
 

diff --git a/source/vslider.cpp b/source/vslider.cpp
index 6bc1553ded3ad8df6f9e5e24eeeb48f582a1f3de..cb345bb7aa9a24ba04a39d4e93ad6e3bb731b71a 100644 (file)
--- a/source/vslider.cpp
+++ b/source/vslider.cpp
@@ -62,7 +62,7 @@ void VSlider::pointer_motion(int, int y)
                drag(y);
 }
 
-void VSlider::on_geometry_change()
+void VSlider::on_size_change()
 {
        drag_area_size = geom.h-total_margin;
 }
@@ -80,7 +80,7 @@ void VSlider::on_style_change()
                total_margin = margin.bottom+margin.top;
        }
 
-       on_geometry_change();
+       on_size_change();
 }
 
 } // namespace GLtk

diff --git a/source/vslider.h b/source/vslider.h
index 6086d3fcf3c6db791fa3ef6f4fa462b7accbdae5..96fd03fbd40b05f72b6523936c868dd674fc20d1 100644 (file)
--- a/source/vslider.h
+++ b/source/vslider.h
@@ -25,7 +25,7 @@ public:
        virtual void button_release(int, int, unsigned);
        virtual void pointer_motion(int, int);
 private:
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_style_change();
 };
 

diff --git a/source/widget.cpp b/source/widget.cpp
index 246c8c196ced2222237a9f10af93a71fcb114160..d6d57554fc5f324f02f22f48a48c5dbe3386903c 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -72,8 +72,7 @@ void Widget::set_geometry(const Geometry &g)
        geom = g;
        if(size_changed)
        {
-               // TODO maybe rename this to on_size_change
-               on_geometry_change();
+               on_size_change();
                rebuild();
        }
 }

diff --git a/source/widget.h b/source/widget.h
index 94ee7f69ff4b3a4d0b00b42ac9f02fa185c3c0cc..2e8ef7ab09ae8002f4f1037b30dba36d4dc5c40e 100644 (file)
--- a/source/widget.h
+++ b/source/widget.h
@@ -159,9 +159,12 @@ public:
        virtual bool navigate(Navigation) { return false; }
        virtual void animate(const Time::TimeDelta &) { }
 protected:
-       virtual void on_geometry_change() { }
+       virtual void on_size_change() { on_geometry_change(); }
        virtual void on_style_change() { }
        virtual void on_reparent() { }
+
+       // Deprecated
+       virtual void on_geometry_change() { }
 };
 
 } // namespace GLtk