Refactor the Panel focus logic
Add visibility property to widgets
pointer_focus->button_press(x-geom.x, y-geom.y, btn);
else if(geom.is_inside(x, y))
{
pointer_focus->button_press(x-geom.x, y-geom.y, btn);
else if(geom.is_inside(x, y))
{
- for(ChildSeq::iterator i=children.begin(); i!=children.end(); ++i)
- if((*i)->get_geometry().is_inside(x-geom.x, y-geom.y))
- {
- (*i)->button_press(x-geom.x, y-geom.y, btn);
- pointer_grab=btn;
- set_input_focus(*i);
- }
+ if(Widget *wdg=get_child_at(x, y))
+ {
+ wdg->button_press(x-geom.x, y-geom.y, btn);
+ pointer_grab=btn;
+ set_input_focus(wdg);
+ }
- for(ChildSeq::iterator i=children.begin(); i!=children.end(); ++i)
- if((*i)->get_geometry().is_inside(x-geom.x, y-geom.y))
- {
- set_pointer_focus(*i);
- break;
- }
+ set_pointer_focus(get_child_at(x, y));
}
}
else if(geom.is_inside(x, y))
{
}
}
else if(geom.is_inside(x, y))
{
- for(ChildSeq::iterator i=children.begin(); i!=children.end(); ++i)
- if((*i)->get_geometry().is_inside(x-geom.x, y-geom.y))
- (*i)->button_release(x-geom.x, y-geom.y, btn);
+ if(Widget *wdg=get_child_at(x, y))
+ wdg->button_release(x-geom.x, y-geom.y, btn);
pointer_focus->pointer_motion(x-geom.x, y-geom.y);
else if(geom.is_inside(x, y))
{
pointer_focus->pointer_motion(x-geom.x, y-geom.y);
else if(geom.is_inside(x, y))
{
- bool found=false;
- for(ChildSeq::iterator i=children.begin(); i!=children.end(); ++i)
- if((*i)->get_geometry().is_inside(x-geom.x, y-geom.y))
- {
- set_pointer_focus(*i);
- (*i)->pointer_motion(x-geom.x, y-geom.y);
- found=true;
- }
-
- if(!found)
- set_pointer_focus(0);
+ Widget *wdg=get_child_at(x, y);
+ set_pointer_focus(wdg);
+ if(wdg)
+ wdg->pointer_motion(x-geom.x, y-geom.y);
if(part.get_name()=="children")
{
for(ChildSeq::const_iterator i=children.begin(); i!=children.end(); ++i)
if(part.get_name()=="children")
{
for(ChildSeq::const_iterator i=children.begin(); i!=children.end(); ++i)
+ if((*i)->is_visible())
+ (*i)->render();
}
else
Widget::render_part(part);
}
else
Widget::render_part(part);
+Widget *Panel::get_child_at(int x, int y)
+{
+ for(ChildSeq::reverse_iterator i=children.rbegin(); i!=children.rend(); ++i)
+ if((*i)->is_visible() && (*i)->get_geometry().is_inside(x-geom.x, y-geom.y))
+ return *i;
+
+ return 0;
+}
+
Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
Widget::Loader(p),
Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
Widget::Loader(p),
wdg_map(m)
{
add("label", &Loader::child<Label>);
wdg_map(m)
{
add("label", &Loader::child<Label>);
+ add("panel", &Loader::panel);
}
template<typename T>
void Panel::Loader::child(const string &n)
{
}
template<typename T>
void Panel::Loader::child(const string &n)
{
- RefPtr<T> chl=new T(panel.res);
+ RefPtr<T> chl=new T(pnl.res);
wdg_map[n]=chl.release();
}
wdg_map[n]=chl.release();
}
+void Panel::Loader::panel(const string &n)
+{
+ RefPtr<Panel> p=new Panel(pnl.res);
+ load_sub(*p, wdg_map);
+ pnl.add(*p.get());
+ wdg_map[n]=p.release();
+}
+
} // namespace GLtk
} // namespace Msp
} // namespace GLtk
} // namespace Msp
class Loader: public Widget::Loader
{
private:
class Loader: public Widget::Loader
{
private:
std::map<std::string, Widget *> &wdg_map;
public:
std::map<std::string, Widget *> &wdg_map;
public:
private:
template<typename T>
void child(const std::string &);
private:
template<typename T>
void child(const std::string &);
+ void panel(const std::string &);
};
Panel(const Resources &);
};
Panel(const Resources &);
void render_part(const Part &) const;
void set_pointer_focus(Widget *);
void set_input_focus(Widget *);
void render_part(const Part &) const;
void set_pointer_focus(Widget *);
void set_input_focus(Widget *);
+ Widget *get_child_at(int, int);
Widget::Widget(const Resources &r):
res(r),
style(0),
Widget::Widget(const Resources &r):
res(r),
style(0),
+ state(NORMAL),
+ visible(true)
{ }
void Widget::update_style()
{ }
void Widget::update_style()
add("position", &Loader::position);
add("size", &Loader::size);
add("style", &Loader::style);
add("position", &Loader::position);
add("size", &Loader::size);
add("style", &Loader::style);
+ add("visible", &Widget::visible);
}
void Widget::Loader::position(int x, int y)
}
void Widget::Loader::position(int x, int y)
public:
Loader(Widget &);
public:
Loader(Widget &);
+ Widget &get_object() const { return wdg; }
private:
void position(int, int);
void size(unsigned, unsigned);
private:
void position(int, int);
void size(unsigned, unsigned);
void set_geometry(const Geometry &);
void set_style(const std::string &);
const Geometry &get_geometry() const { return geom; }
void set_geometry(const Geometry &);
void set_style(const std::string &);
const Geometry &get_geometry() const { return geom; }
+ bool is_visible() const { return visible; }
void render() const;
virtual void button_press(int, int, unsigned) { }
virtual void button_release(int, int, unsigned) { }
void render() const;
virtual void button_press(int, int, unsigned) { }
virtual void button_release(int, int, unsigned) { }
std::string style_name;
const Style *style;
State state;
std::string style_name;
const Style *style;
State state;
Widget(const Resources &);
virtual const char *get_class() const { return "widget"; }
Widget(const Resources &);
virtual const char *get_class() const { return "widget"; }