Adjustments to camera management layout

victor-david · Aug 21, 2020 · 95d926c · 95d926c
1 parent bda9d00
commit 95d926c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 30 deletions.
diff --git a/src/Camera.App/Core/Config.cs b/src/Camera.App/Core/Config.cs
@@ -54,22 +54,22 @@ public static class CameraManageWindow
  /// <summary>
  /// Gets the default width for the camera manage window.
  /// </summary>
- public const int Width = 916;
+ public const int Width = 920;
 
  /// <summary>
  /// Gets the default height for the camera manage window.
  /// </summary>
- public const int Height = 498;
+ public const int Height = 580;
 
  /// <summary>
  /// Gets the minimum width for the camera manage window.
  /// </summary>
- public const int MinWidth = 720;
+ public const int MinWidth = 920;
 
  /// <summary>
  /// Gets the minimum height for the camera manage window.
  /// </summary>
- public const int MinHeight = 498;
+ public const int MinHeight = 580;
  }
  }
  #endregion

diff --git a/src/Camera.App/Resources/Dictionary/Box.xaml b/src/Camera.App/Resources/Dictionary/Box.xaml
@@ -41,7 +41,7 @@
  </Style>
 
  <Style TargetType="CheckBox">
- <Setter Property="Margin" Value="4"/>
+ <Setter Property="Margin" Value="2,4"/>
  <Setter Property="Cursor" Value="Hand"/>
  <Setter Property="BorderBrush" Value="{StaticResource DefaultBorderBrush}"/>
  <Setter Property="BorderThickness" Value="1"/>

diff --git a/src/Camera.App/View/CameraManageWindow.xaml b/src/Camera.App/View/CameraManageWindow.xaml
@@ -42,8 +42,8 @@
  <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Camera.Password}"/>
  </Grid>
 
- <!-- Status / orientation-->
- <Grid core:Property.ColumnWidths="*,*,*" Margin="6">
+ <!-- Status / orientation / max preset -->
+ <Grid core:Property.ColumnWidths="*,*,*,*" Margin="4,6">
  <StackPanel>
  <TextBlock Text="Status Placement"/>
  <CheckBox Content="Top" IsChecked="{Binding IsStatusTop}"/>
@@ -63,30 +63,26 @@
  <CheckBox Content="Flipped" IsChecked="{Binding IsFlipped}"/>
  <CheckBox Content="Mirrored" IsChecked="{Binding IsMirrored}"/>
  </StackPanel>
+
+ <StackPanel Grid.Column="3">
+ <TextBlock Text="Max Preset"/>
+ <ListBox
+ MaxHeight="68"
+ ItemsSource="{Binding PresetList}"
+ SelectedItem="{Binding SelectedMaxPreset}"/>
+ </StackPanel>
+
  </Grid>
-
- <Grid core:Property.RowHeights="Auto,*" core:Property.ColumnWidths="*, 80">
-
- <!-- Notes -->
- <TextBlock Text="Notes"/>
- <TextBox
- Grid.Row="1"
- Height="Auto"
- VerticalContentAlignment="Top"
- AcceptsReturn="True"
- TextWrapping="Wrap"
- ScrollViewer.VerticalScrollBarVisibility="Auto"
- Text="{Binding Camera.Note}"/>
-
- <!-- Max presets to display -->
- <TextBlock Grid.Column="1" Text="Max Preset"/>
- <ListBox
- Grid.Row="1"
- Grid.Column="1"
- ItemsSource="{Binding PresetList}"
- SelectedItem="{Binding SelectedMaxPreset}"/>
-
- </Grid>
+
+ <!-- Notes -->
+ <TextBlock Text="Notes"/>
+ <TextBox
+ Height="Auto"
+ VerticalContentAlignment="Top"
+ AcceptsReturn="True"
+ TextWrapping="Wrap"
+ ScrollViewer.VerticalScrollBarVisibility="Auto"
+ Text="{Binding Camera.Note}"/>
 
  </DockPanel>
  </HeaderedContentControl>