UI|Client|Widgets: ChoiceWidget's width depends on widest child item

Also corrected some workarounds to issues that are no longer relevant, related to hidden children in a MenuWidget. There is no reason to not update or otherwise ignore hidden widgets any more.
skyjake · Aug 24, 2013 · 5b8bf0f · 5b8bf0f
1 parent b47daf4
commit 5b8bf0f
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 12 deletions.
diff --git a/doomsday/client/include/ui/widgets/choicewidget.h b/doomsday/client/include/ui/widgets/choicewidget.h
@@ -63,7 +63,6 @@ class ChoiceWidget : public ButtonWidget
     void setSelected(ui::Context::Pos pos);
 
     ui::Context::Pos selected() const;
-
     ui::Item const &selectedItem() const;
 
 public slots:

diff --git a/doomsday/client/src/ui/widgets/choicewidget.cpp b/doomsday/client/src/ui/widgets/choicewidget.cpp
@@ -27,7 +27,7 @@ DENG_GUI_PIMPL(ChoiceWidget),
 DENG2_OBSERVES(Context, Addition),
 DENG2_OBSERVES(Context, Removal),
 DENG2_OBSERVES(ContextWidgetOrganizer, WidgetCreation)
-{   
+{
     /**
      * Items in the choice's popup uses this as action to change the selected
      * item.
@@ -61,6 +61,8 @@ DENG2_OBSERVES(ContextWidgetOrganizer, WidgetCreation)
     Instance(Public *i) : Base(i), selected(Context::InvalidPos)
     {
         self.setFont("choice.selected");
+        self.setSizePolicy(ui::Fixed, ui::Expand);
+        //self.setAlignment(ui::AlignLeft);
 
         choices = new PopupMenuWidget;
         choices->setAnchorAndOpeningDirection(self.hitRule(), ui::Right);
@@ -69,6 +71,10 @@ DENG2_OBSERVES(ContextWidgetOrganizer, WidgetCreation)
         choices->menu().organizer().audienceForWidgetCreation += this;
         self.add(choices);
 
+        // The choice button itself has the same width as the choice menu
+        // (i.e., the longest item's width).
+        self.rule().setInput(Rule::Width, choices->menu().rule().width());
+
         self.setAction(new SignalAction(thisPublic, SLOT(openPopup())));
 
         updateButtonWithSelection();

diff --git a/doomsday/client/src/ui/widgets/contextwidgetorganizer.cpp b/doomsday/client/src/ui/widgets/contextwidgetorganizer.cpp
@@ -88,12 +88,6 @@ DENG2_OBSERVES(ui::Item,    Change     )
         GuiWidget *w = factory->makeItemWidget(item, container);
         if(!w) return; // Unpresentable.
 
-        // Others may alter the widget in some way.
-        DENG2_FOR_PUBLIC_AUDIENCE(WidgetCreation, i)
-        {
-            i->widgetCreatedForItem(*w, item);
-        }
-
         // Update the widget immediately.
         mapping.insert(&item, w);
         itemChanged(item);
@@ -108,6 +102,12 @@ DENG2_OBSERVES(ui::Item,    Change     )
             container->insertBefore(w, *mapping[&context->at(pos + 1)]);
         }
 
+        // Others may alter the widget in some way.
+        DENG2_FOR_PUBLIC_AUDIENCE(WidgetCreation, i)
+        {
+            i->widgetCreatedForItem(*w, item);
+        }
+
         // Observe.
         w->audienceForDeletion += this; // in case it's manually deleted
         item.audienceForChange += this;

diff --git a/doomsday/client/src/ui/widgets/dialogwidget.cpp b/doomsday/client/src/ui/widgets/dialogwidget.cpp
@@ -241,7 +241,10 @@ DENG2_OBSERVES(ui::Context, Removal)
         // All label-based widgets should expand on their own.
         if(LabelWidget *lab = w.maybeAs<LabelWidget>())
         {
-            lab->setSizePolicy(ui::Expand, ui::Expand);
+            if(!w.is<ChoiceWidget>())
+            {
+                lab->setSizePolicy(ui::Expand, ui::Expand);
+            }
         }
 
         // Toggles should have no background.

diff --git a/doomsday/client/src/ui/widgets/gltextcomposer.cpp b/doomsday/client/src/ui/widgets/gltextcomposer.cpp
@@ -211,6 +211,8 @@ DENG2_PIMPL(GLTextComposer)
 
     void updateLineLayout(Rangei const &lineRange)
     {
+        if(lineRange.isEmpty()) return;
+
         Rangei current = lineRange;
         forever
         {

diff --git a/doomsday/client/src/ui/widgets/labelwidget.cpp b/doomsday/client/src/ui/widgets/labelwidget.cpp
@@ -532,7 +532,7 @@ void LabelWidget::update()
 {
     GuiWidget::update();
 
-    if(!isHidden())
+    //if(!isHidden())
     {
         d->update();
     }

diff --git a/doomsday/client/src/ui/widgets/menuwidget.cpp b/doomsday/client/src/ui/widgets/menuwidget.cpp
@@ -227,7 +227,7 @@ public ContextWidgetOrganizer::IWidgetFactory
     {
         if(GuiWidget const *widget = child->maybeAs<GuiWidget>())
         {
-            return widget->isVisible();
+            return !widget->behavior().testFlag(Widget::Hidden);
         }
         return false;
     }
@@ -336,7 +336,7 @@ ContextWidgetOrganizer const &MenuWidget::organizer() const
 
 void MenuWidget::update()
 {
-    if(isHidden()) return;
+    //if(isHidden()) return;
 
     if(d->needLayout)
     {