Fixed|UI|Client: ChoiceWidget item order change vs. updating selected…

… item
skyjake · Sep 12, 2013 · db4c18c · db4c18c
1 parent 6142c07
commit db4c18c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/doomsday/client/src/ui/widgets/choicewidget.cpp b/doomsday/client/src/ui/widgets/choicewidget.cpp
@@ -26,6 +26,7 @@ using namespace ui;
 DENG_GUI_PIMPL(ChoiceWidget),
 DENG2_OBSERVES(Data, Addition),
 DENG2_OBSERVES(Data, Removal),
+DENG2_OBSERVES(Data, OrderChange),
 DENG2_OBSERVES(ContextWidgetOrganizer, WidgetCreation),
 DENG2_OBSERVES(ContextWidgetOrganizer, WidgetUpdate)
 {
@@ -68,6 +69,7 @@ DENG2_OBSERVES(ContextWidgetOrganizer, WidgetUpdate)
         choices = new PopupMenuWidget;
         choices->items().audienceForAddition += this;
         choices->items().audienceForRemoval += this;
+        choices->items().audienceForOrderChange += this;
         choices->menu().organizer().audienceForWidgetCreation += this;
         choices->menu().organizer().audienceForWidgetUpdate += this;
         self.add(choices);
@@ -141,6 +143,11 @@ DENG2_OBSERVES(ContextWidgetOrganizer, WidgetUpdate)
         updateButtonWithSelection();
     }
 
+    void contextItemOrderChanged()
+    {
+        updateButtonWithSelection();
+    }
+
     void updateItemHighlight()
     {
         // Highlight the currently selected item.

diff --git a/doomsday/client/src/ui/widgets/profilepickerwidget.cpp b/doomsday/client/src/ui/widgets/profilepickerwidget.cpp
@@ -198,6 +198,8 @@ void ProfilePickerWidget::duplicate()
 
                 items().append(new ChoiceItem(newName.left(MAX_VISIBLE_PROFILE_NAME), newName)).sort();
                 setSelected(items().findData(newName));
+
+                applySelectedProfile();
             }
             else
             {