|
14 | 14 | Topmost="True" |
15 | 15 | ResizeMode="NoResize" |
16 | 16 | SizeToContent="WidthAndHeight" |
17 | | - Name="This" |
18 | 17 | Left="{Binding RegionSelectorViewModel.LeftDip, Mode=TwoWay, Source={StaticResource ServiceLocator}}" |
19 | 18 | Top="{Binding RegionSelectorViewModel.TopDip, Mode=TwoWay, Source={StaticResource ServiceLocator}}" |
20 | 19 | ShowInTaskbar="False"> |
|
170 | 169 | Margin="0,10,0,0"> |
171 | 170 | <Border BorderThickness="1" |
172 | 171 | Name="SizeBorder" |
173 | | - BorderBrush="{DynamicResource Accent}"> |
174 | | - <DockPanel HorizontalAlignment="Right" |
175 | | - Background="{DynamicResource WindowBackground}"> |
| 172 | + BorderBrush="{DynamicResource Accent}" |
| 173 | + VerticalAlignment="Top"> |
| 174 | + <Grid HorizontalAlignment="Right" |
| 175 | + Background="{DynamicResource WindowBackground}"> |
| 176 | + <Grid.ColumnDefinitions> |
| 177 | + <ColumnDefinition/> |
| 178 | + <ColumnDefinition Width="Auto"/> |
| 179 | + <ColumnDefinition/> |
| 180 | + </Grid.ColumnDefinitions> |
| 181 | + |
176 | 182 | <xctk:IntegerUpDown Width="60" |
177 | | - DockPanel.Dock="Right" |
178 | 183 | Margin="3" |
179 | | - x:Name="HeightBox" |
180 | | - Value="{Binding RegionSelectorViewModel.Height, Mode=TwoWay, Source={StaticResource ServiceLocator}}"/> |
| 184 | + x:Name="WidthBox" |
| 185 | + Value="{Binding RegionSelectorViewModel.Width, Mode=TwoWay, Source={StaticResource ServiceLocator}}"/> |
181 | 186 |
|
182 | 187 | <Label Content="x" |
183 | | - DockPanel.Dock="Right" |
184 | | - Margin="7,3"/> |
| 188 | + Margin="7,3" |
| 189 | + Grid.Column="1"/> |
185 | 190 |
|
186 | 191 | <xctk:IntegerUpDown Width="60" |
187 | | - DockPanel.Dock="Right" |
188 | 192 | Margin="3" |
189 | | - x:Name="WidthBox" |
190 | | - Value="{Binding RegionSelectorViewModel.Width, Mode=TwoWay, Source={StaticResource ServiceLocator}}"/> |
191 | | - </DockPanel> |
| 193 | + x:Name="HeightBox" |
| 194 | + Value="{Binding RegionSelectorViewModel.Height, Mode=TwoWay, Source={StaticResource ServiceLocator}}" |
| 195 | + Grid.Column="2"/> |
| 196 | + |
| 197 | + <Grid.LayoutTransform> |
| 198 | + <ScaleTransform ScaleX="0.9" ScaleY="0.9"/> |
| 199 | + </Grid.LayoutTransform> |
| 200 | + </Grid> |
192 | 201 |
|
193 | 202 | <Border.Style> |
194 | 203 | <Style TargetType="Border"> |
195 | 204 | <Setter Property="HorizontalAlignment" Value="Right"/> |
196 | 205 | <Style.Triggers> |
197 | | - <DataTrigger Binding="{Binding Width, ElementName=This, Converter={StaticResource IsLessThanConverter}, ConverterParameter=500}" Value="True"> |
| 206 | + <DataTrigger Binding="{Binding Width, ElementName=Region, Converter={StaticResource IsLessThanConverter}, ConverterParameter=400}" Value="True"> |
198 | 207 | <Setter Property="HorizontalAlignment" Value="Left"/> |
199 | 208 | <Setter Property="Margin" Value="0,40,0,0"/> |
200 | 209 | </DataTrigger> |
|
0 commit comments