X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flayout.cpp;h=743b30ebf3263b7246659191aeca349906623513;hb=c8291177b545ec81930603a5915234a60296db51;hp=c616ff6fc7caff9833070cf1c30e7c7710e20ad9;hpb=8eeb6ee5d40c21150839e24996cc3e9ef308374d;p=libs%2Fgltk.git diff --git a/source/layout.cpp b/source/layout.cpp index c616ff6..743b30e 100644 --- a/source/layout.cpp +++ b/source/layout.cpp @@ -213,7 +213,7 @@ void Layout::update_slot_indices() n_active_slots = 0; for(list::iterator i=slots.begin(); i!=slots.end(); ++i) { - if((*i)->widget.is_visible()) + if((*i)->widget.is_visible() || (*i)->ghost) (*i)->index = n_active_slots++; else (*i)->index = -1; @@ -295,6 +295,19 @@ void Layout::set_expand(Widget &wdg, bool h, bool v) update(); } +void Layout::set_ghost(Widget &wdg, bool g) +{ + Slot &slot = get_slot_for_widget(wdg); + + slot.ghost = g; + + if(!wdg.is_visible()) + { + update_slot_indices(); + update(); + } +} + void Layout::update() { solve_constraints(HORIZONTAL, UPDATE); @@ -444,7 +457,8 @@ Layout::Packing::Packing(): Layout::Slot::Slot(Layout &l, Widget &w): layout(l), index(0), - widget(w) + widget(w), + ghost(false) { vert_pack.gravity = 1; widget.signal_autosize_changed.connect(sigc::mem_fun(this, &Slot::autosize_changed)); @@ -458,7 +472,7 @@ void Layout::Slot::autosize_changed() widget.autosize(); autosize_geom = widget.get_geometry(); - if(!widget.is_visible()) + if(!widget.is_visible() && !ghost) return; // If the widget fits in the area it had, just leave it there. @@ -474,7 +488,7 @@ void Layout::Slot::autosize_changed() void Layout::Slot::visibility_changed(bool v) { layout.update_slot_indices(); - if(v) + if(v || ghost) { layout.container->signal_autosize_changed.emit(); layout.update(); @@ -530,6 +544,7 @@ Layout::WidgetLoader::WidgetLoader(Layout &l, Widget &w, const Layout::Loader::W { add("constraint", &WidgetLoader::constraint); add("expand", &WidgetLoader::expand); + add("ghost", &WidgetLoader::ghost); add("gravity", &WidgetLoader::gravity); } @@ -544,6 +559,11 @@ void Layout::WidgetLoader::expand(bool h, bool v) layout.set_expand(widget, h, v); } +void Layout::WidgetLoader::ghost(bool g) +{ + layout.set_ghost(widget, g); +} + void Layout::WidgetLoader::gravity(int h, int v) { layout.set_gravity(widget, h, v);