Skip to content

Commit 63ef605

Browse files
committed
Disable Region W, H boxes during recording
1 parent 21bf97a commit 63ef605

2 files changed

Lines changed: 27 additions & 16 deletions

File tree

src/Captura/Pages/HomePage.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,15 @@
7373
Grid.Column="4"
7474
Margin="5,0,3,0"/>
7575
<xctk:IntegerUpDown Grid.Column="5"
76-
Value="{Binding RegionSelectorViewModel.Width, Mode=TwoWay, Source={StaticResource ServiceLocator}}"/>
76+
Value="{Binding RegionSelectorViewModel.Width, Mode=TwoWay, Source={StaticResource ServiceLocator}}"
77+
IsEnabled="{Binding ViewConditions.IsEnabled.Value, Source={StaticResource ServiceLocator}}"/>
7778

7879
<Label Content="H:"
7980
Grid.Column="6"
8081
Margin="5,0,3,0"/>
8182
<xctk:IntegerUpDown Grid.Column="7"
82-
Value="{Binding RegionSelectorViewModel.Height, Mode=TwoWay, Source={StaticResource ServiceLocator}}"/>
83+
Value="{Binding RegionSelectorViewModel.Height, Mode=TwoWay, Source={StaticResource ServiceLocator}}"
84+
IsEnabled="{Binding ViewConditions.IsEnabled.Value, Source={StaticResource ServiceLocator}}"/>
8385
</Grid>
8486

8587
<CheckBox Margin="0,5"

src/Captura/Windows/RegionSelector.xaml

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
Topmost="True"
1515
ResizeMode="NoResize"
1616
SizeToContent="WidthAndHeight"
17-
Name="This"
1817
Left="{Binding RegionSelectorViewModel.LeftDip, Mode=TwoWay, Source={StaticResource ServiceLocator}}"
1918
Top="{Binding RegionSelectorViewModel.TopDip, Mode=TwoWay, Source={StaticResource ServiceLocator}}"
2019
ShowInTaskbar="False">
@@ -170,31 +169,41 @@
170169
Margin="0,10,0,0">
171170
<Border BorderThickness="1"
172171
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+
176182
<xctk:IntegerUpDown Width="60"
177-
DockPanel.Dock="Right"
178183
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}}"/>
181186

182187
<Label Content="x"
183-
DockPanel.Dock="Right"
184-
Margin="7,3"/>
188+
Margin="7,3"
189+
Grid.Column="1"/>
185190

186191
<xctk:IntegerUpDown Width="60"
187-
DockPanel.Dock="Right"
188192
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>
192201

193202
<Border.Style>
194203
<Style TargetType="Border">
195204
<Setter Property="HorizontalAlignment" Value="Right"/>
196205
<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">
198207
<Setter Property="HorizontalAlignment" Value="Left"/>
199208
<Setter Property="Margin" Value="0,40,0,0"/>
200209
</DataTrigger>

0 commit comments

Comments
 (0)