Fixed ScrollView position not being correctly applied after deserialization.

Engine/UI/DropDownList.cpp

@@ -37,7 +37,8 @@ OBJECTTYPESTATIC(DropDownList);
 
 DropDownList::DropDownList(Context* context) :
     Menu(context),
-    resizePopup_(false)
+    resizePopup_(false),
+    selectionAttr_(0)
 {
     Window* window = new Window(context_);
     window->SetInternal(true);
@@ -64,7 +65,7 @@ void DropDownList::RegisterObject(Context* context)
     context->RegisterFactory<DropDownList>();
     
     COPY_BASE_ATTRIBUTES(DropDownList, Menu);
-    ACCESSOR_ATTRIBUTE(DropDownList, VAR_INT, "Selection", GetSelection, SetSelectionAttr, unsigned, M_MAX_UNSIGNED, AM_FILE);
+    ACCESSOR_ATTRIBUTE(DropDownList, VAR_INT, "Selection", GetSelection, SetSelectionAttr, unsigned, 0, AM_FILE);
     ACCESSOR_ATTRIBUTE(DropDownList, VAR_BOOL, "Resize Popup", GetResizePopup, SetResizePopup, bool, false, AM_FILE);
 }
 

Engine/UI/ScrollView.cpp

@@ -42,6 +42,7 @@ ScrollView::ScrollView(Context* context) :
     UIElement(context),
     viewPosition_(IntVector2::ZERO),
     viewSize_(IntVector2::ZERO),
+    viewPositionAttr_(IntVector2::ZERO),
     pageStep_(1.0f)
 {
     clipChildren_ = true;
@@ -75,7 +76,7 @@ void ScrollView::RegisterObject(Context* context)
 {
     context->RegisterFactory<ScrollView>();
     
-    REF_ACCESSOR_ATTRIBUTE(ScrollView, VAR_INTVECTOR2, "View Position", GetViewPosition, SetViewPosition, IntVector2, IntVector2::ZERO, AM_FILE);
+    REF_ACCESSOR_ATTRIBUTE(ScrollView, VAR_INTVECTOR2, "View Position", GetViewPosition, SetViewPositionAttr, IntVector2, IntVector2::ZERO, AM_FILE);
     ACCESSOR_ATTRIBUTE(ScrollView, VAR_FLOAT, "Scroll Step", GetScrollStep, SetScrollStep, float, 0.1f, AM_FILE);
     ACCESSOR_ATTRIBUTE(ScrollView, VAR_FLOAT, "Page Step", GetPageStep, SetPageStep, float, 1.0f, AM_FILE);
     COPY_BASE_ATTRIBUTES(ScrollView, UIElement);
@@ -94,6 +95,9 @@ void ScrollView::ApplyAttributes()
         SetContentElement(scrollPanel_->GetChild(0));
     
     OnResize();
+    
+    // Reapply view position with proper content element and size
+    SetViewPosition(viewPositionAttr_);
 }
 
 void ScrollView::OnWheel(int delta, int buttons, int qualifiers)
@@ -238,6 +242,12 @@ float ScrollView::GetScrollStep() const
     return horizontalScrollBar_->GetScrollStep();
 }
 
+void ScrollView::SetViewPositionAttr(const IntVector2& value)
+{
+    viewPositionAttr_ = value;
+    SetViewPosition(value);
+}
+
 void ScrollView::UpdateViewSize()
 {
     IntVector2 size(IntVector2::ZERO);

Engine/UI/ScrollView.h

@@ -81,6 +81,9 @@ public:
     /// Return arrow key page step.
     float GetPageStep() const { return pageStep_; }
     
+    /// Set view position attribut.
+    void SetViewPositionAttr(const IntVector2& value);
+    
 protected:
     /// Update view size from the content element.
     void UpdateViewSize();
@@ -101,6 +104,8 @@ protected:
     IntVector2 viewPosition_;
     /// Total view size.
     IntVector2 viewSize_;
+    /// View offset attribute.
+    IntVector2 viewPositionAttr_;
     /// Arrow key page step.
     float pageStep_;
     /// Ignore scrollbar events flag. Used to prevent possible endless loop when setting position.