Sync

setchi · Jan 21, 2020 · 124322d · 124322d
1 parent 3b1987b
commit 124322d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/Samples~/Sources/07_ScrollRect/ScrollView.cs b/Samples~/Sources/07_ScrollRect/ScrollView.cs
@@ -26,7 +26,7 @@ public float PaddingTop
  set
  {
  paddingHead = value;
- Refresh();
+ Relayout();
  }
  }
 
@@ -36,7 +36,7 @@ public float PaddingBottom
  set
  {
  paddingTail = value;
- Refresh();
+ Relayout();
  }
  }
 
@@ -46,7 +46,7 @@ public float Spacing
  set
  {
  spacing = value;
- Refresh();
+ Relayout();
  }
  }
 

diff --git a/Samples~/Sources/08_GridView/GridView.cs b/Samples~/Sources/08_GridView/GridView.cs
@@ -24,7 +24,7 @@ public float PaddingTop
  set
  {
  paddingHead = value;
- Refresh();
+ Relayout();
  }
  }
 
@@ -34,7 +34,7 @@ public float PaddingBottom
  set
  {
  paddingTail = value;
- Refresh();
+ Relayout();
  }
  }
 
@@ -44,7 +44,7 @@ public float SpacingY
  set
  {
  spacing = value;
- Refresh();
+ Relayout();
  }
  }
 
@@ -54,7 +54,7 @@ public float SpacingX
  set
  {
  startAxisSpacing = value;
- Refresh();
+ Relayout();
  }
  }
 

diff --git a/Sources/Runtime/Core/FancyScrollView.cs b/Sources/Runtime/Core/FancyScrollView.cs
@@ -93,7 +93,12 @@ protected virtual void UpdateContents(IList<TItemData> itemsSource)
  }
 
  /// <summary>
- /// セルの表示内容を更新します.
+ /// セルのレイアウトを強制的に更新します.
+ /// </summary>
+ protected virtual void Relayout() => UpdatePosition(currentPosition, false);
+
+ /// <summary>
+ /// セルのレイアウトと表示内容を強制的に更新します.
  /// </summary>
  protected virtual void Refresh() => UpdatePosition(currentPosition, true);
 

diff --git a/Sources/Runtime/ScrollRect/FancyScrollRect.cs b/Sources/Runtime/ScrollRect/FancyScrollRect.cs
@@ -138,6 +138,14 @@ protected override void Refresh()
  base.Refresh();
  }
 
+ /// <inheritdoc/>
+ protected override void Relayout()
+ {
+ AdjustCellIntervalAndScrollOffset();
+ RefreshScroller();
+ base.Relayout();
+ }
+
  /// <summary>
  /// <see cref="Scroller"/> の各種状態を更新します.
  /// </summary>

diff --git a/Sources/Runtime/Scroller/Scroller.cs b/Sources/Runtime/Scroller/Scroller.cs
@@ -288,13 +288,8 @@ public void JumpTo(int index)
  throw new ArgumentOutOfRangeException(nameof(index));
  }
 
- autoScrollState.Reset();
-
- velocity = 0f;
- dragging = false;
-
  UpdateSelection(index);
- UpdatePosition(index);
+ Position = index;
  }
 
  /// <summary>