|
107 | 107 | </Track.DecreaseRepeatButton> |
108 | 108 | </Track> |
109 | 109 | </Grid> |
110 | | - |
111 | | - <ControlTemplate.Triggers> |
112 | | - <Trigger Property="IsEnabled" Value="false"> |
113 | | - <Setter TargetName="Thumb" Property="Visibility" Value="Collapsed"/> |
114 | | - </Trigger> |
115 | | - <Trigger Property="Orientation" Value="Horizontal"> |
116 | | - <Setter TargetName="GridRoot" Property="LayoutTransform"> |
117 | | - <Setter.Value> |
118 | | - <RotateTransform Angle="-90"/> |
119 | | - </Setter.Value> |
120 | | - </Setter> |
121 | | - <Setter TargetName="PART_Track" Property="LayoutTransform"> |
122 | | - <Setter.Value> |
123 | | - <RotateTransform Angle="-90"/> |
124 | | - </Setter.Value> |
125 | | - </Setter> |
126 | | - <Setter Property="Width" Value="8"/> |
127 | | - <Setter Property="Height" Value="Auto"/> |
128 | | - <Setter TargetName="Thumb" Property="Tag" Value="Horizontal"/> |
129 | | - <Setter TargetName="PageDown" Property="Command" Value="ScrollBar.PageLeftCommand"/> |
130 | | - <Setter TargetName="PageUp" Property="Command" Value="ScrollBar.PageRightCommand"/> |
131 | | - </Trigger> |
132 | | - </ControlTemplate.Triggers> |
133 | 110 | </ControlTemplate> |
134 | 111 | </Setter.Value> |
135 | 112 | </Setter> |
|
152 | 129 | <Thumb x:Name="Thumb" Background="{TemplateBinding Foreground}" Style="{StaticResource HorizontalScrollThumbs}"/> |
153 | 130 | </Track.Thumb> |
154 | 131 | <Track.IncreaseRepeatButton> |
155 | | - <RepeatButton x:Name="PageRight" Command="ScrollBar.PageRightCommand" Opacity="0" Focusable="false"/> |
| 132 | + <RepeatButton x:Name="PageRight" Command="ScrollBar.PageDownCommand" Opacity="0" Focusable="false"/> |
156 | 133 | </Track.IncreaseRepeatButton> |
157 | 134 | <Track.DecreaseRepeatButton> |
158 | | - <RepeatButton x:Name="PageLeft" Command="ScrollBar.PageLeftCommand" Opacity="0" Focusable="false"/> |
| 135 | + <RepeatButton x:Name="PageLeft" Command="ScrollBar.PageUpCommand" Opacity="0" Focusable="false"/> |
159 | 136 | </Track.DecreaseRepeatButton> |
160 | 137 | </Track> |
161 | 138 | </Grid> |
162 | | - |
163 | | - <ControlTemplate.Triggers> |
164 | | - <Trigger Property="IsEnabled" Value="false"> |
165 | | - <Setter TargetName="Thumb" Property="Visibility" Value="Collapsed"/> |
166 | | - </Trigger> |
167 | | - <Trigger Property="Orientation" Value="Horizontal"> |
168 | | - <Setter TargetName="GridRoot" Property="LayoutTransform"> |
169 | | - <Setter.Value> |
170 | | - <RotateTransform Angle="-90"/> |
171 | | - </Setter.Value> |
172 | | - </Setter> |
173 | | - <Setter TargetName="PART_Track" Property="LayoutTransform"> |
174 | | - <Setter.Value> |
175 | | - <RotateTransform Angle="-90"/> |
176 | | - </Setter.Value> |
177 | | - </Setter> |
178 | | - <Setter Property="Width" Value="Auto"/> |
179 | | - <Setter Property="Height" Value="8"/> |
180 | | - <Setter TargetName="Thumb" Property="Tag" Value="Horizontal"/> |
181 | | - <Setter TargetName="PageLeft" Property="Command" Value="ScrollBar.PageLeftCommand"/> |
182 | | - <Setter TargetName="PageRight" Property="Command" Value="ScrollBar.PageRightCommand"/> |
183 | | - </Trigger> |
184 | | - </ControlTemplate.Triggers> |
185 | 139 | </ControlTemplate> |
186 | 140 | </Setter.Value> |
187 | 141 | </Setter> |
|
203 | 157 | <RowDefinition /> |
204 | 158 | <RowDefinition Height="16"/> |
205 | 159 | </Grid.RowDefinitions> |
206 | | - <ScrollContentPresenter Grid.ColumnSpan="3"/> |
207 | | - <ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="1" Value="{TemplateBinding VerticalOffset}" |
| 160 | + <ScrollContentPresenter Grid.Column="0"/> |
| 161 | + <ScrollBar x:Name="PART_VerticalScrollBar" Value="{TemplateBinding VerticalOffset}" Grid.Column="1" |
208 | 162 | Maximum="{TemplateBinding ScrollableHeight}" ViewportSize="{TemplateBinding ViewportHeight}" |
209 | 163 | Style="{DynamicResource VerticalScrollBar}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/> |
210 | 164 |
|
211 | | - <ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Row="1" Value="{TemplateBinding HorizontalOffset}" |
| 165 | + <ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Row="1" Value="{TemplateBinding HorizontalOffset}" Orientation="Horizontal" |
212 | 166 | Maximum="{TemplateBinding ScrollableWidth}" ViewportSize="{TemplateBinding ViewportWidth}" |
213 | 167 | Style="{DynamicResource HorizontalScrollBar}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/> |
214 | 168 | </Grid> |
|
0 commit comments