X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=59553b45de0122136a4c410ebf06a50ed378f6e4;hb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;hp=4d7e1a9df3d0aa814aa225c9dc47038d58fc3f68;hpb=75a16eae9eb2714f8112d46fa5b8f7908b6d2487;p=libs%2Fgltk.git diff --git a/source/panel.cpp b/source/panel.cpp index 4d7e1a9..59553b4 100644 --- a/source/panel.cpp +++ b/source/panel.cpp @@ -49,9 +49,9 @@ void Panel::raise(Widget &wdg) Widget *Panel::get_final_input_focus() const { - if(Panel *panel=dynamic_cast(input_focus)) + if(Panel *panel = dynamic_cast(input_focus)) { - Widget *focus=panel->get_final_input_focus(); + Widget *focus = panel->get_final_input_focus(); if(focus) return focus; } @@ -62,12 +62,12 @@ void Panel::button_press(int x, int y, unsigned btn) { if(pointer_grabbed) { - const Geometry &cgeom=pointer_focus->get_geometry(); + const Geometry &cgeom = pointer_focus->get_geometry(); pointer_focus->button_press(x-cgeom.x, y-cgeom.y, btn); } else { - if(Widget *wdg=get_child_at(x, y)) + if(Widget *wdg = get_child_at(x, y)) { set_pointer_focus(wdg); if(wdg->is_focusable()) @@ -81,7 +81,7 @@ void Panel::button_release(int x, int y, unsigned btn) { if(pointer_grabbed) { - const Geometry &cgeom=pointer_focus->get_geometry(); + const Geometry &cgeom = pointer_focus->get_geometry(); pointer_focus->button_release(x-cgeom.x, y-cgeom.y, btn); } else @@ -92,7 +92,7 @@ void Panel::pointer_motion(int x, int y) { if(pointer_grabbed) { - const Geometry &cgeom=pointer_focus->get_geometry(); + const Geometry &cgeom = pointer_focus->get_geometry(); pointer_focus->pointer_motion(x-cgeom.x, y-cgeom.y); } else @@ -147,7 +147,7 @@ void Panel::set_pointer_focus(Widget *wdg) if(pointer_focus) pointer_focus->pointer_leave(); - pointer_focus=wdg; + pointer_focus = wdg; if(pointer_focus) pointer_focus->pointer_enter(); @@ -161,7 +161,7 @@ void Panel::set_input_focus(Widget *wdg) if(input_focus) input_focus->focus_out(); - input_focus=wdg; + input_focus = wdg; if(input_focus) { @@ -193,18 +193,18 @@ Panel::Loader::Loader(Panel &p, map &m): template void Panel::Loader::child(const string &n) { - RefPtr chl=new T(pnl.res); + RefPtr chl = new T(pnl.res); load_sub(*chl); pnl.add(*chl.get()); - wdg_map[n]=chl.release(); + wdg_map[n] = chl.release(); } void Panel::Loader::panel(const string &n) { - RefPtr p=new Panel(pnl.res); + RefPtr p = new Panel(pnl.res); load_sub(*p, wdg_map); pnl.add(*p.get()); - wdg_map[n]=p.release(); + wdg_map[n] = p.release(); } @@ -226,7 +226,7 @@ void Panel::Child::visibility_changed(bool v) { if(!v) { - Panel &panel=static_cast(container); + Panel &panel = static_cast(container); if(widget==panel.pointer_focus) panel.set_pointer_focus(0); if(widget==panel.input_focus) @@ -236,7 +236,7 @@ void Panel::Child::visibility_changed(bool v) void Panel::Child::request_focus() { - Panel &panel=static_cast(container); + Panel &panel = static_cast(container); panel.set_input_focus(widget); if(panel.parent && panel.visible) panel.set_focus(); @@ -244,23 +244,23 @@ void Panel::Child::request_focus() void Panel::Child::grab_pointer() { - Panel &panel=static_cast(container); + Panel &panel = static_cast(container); if(!panel.pointer_grabbed) { panel.set_pointer_focus(widget); - panel.pointer_grabbed=true; + panel.pointer_grabbed = true; panel.signal_grab_pointer.emit(); } } void Panel::Child::ungrab_pointer() { - Panel &panel=static_cast(container); + Panel &panel = static_cast(container); if(panel.pointer_grabbed && panel.pointer_focus==widget) { // XXX Should set to the widget under pointer panel.set_pointer_focus(0); - panel.pointer_grabbed=false; + panel.pointer_grabbed = false; panel.signal_ungrab_pointer.emit(); } }