Skip to content

Profile Layout Aligned and Controls Optimized #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tolu2492 wants to merge 1 commit into
base: userinterface
Choose a base branch
from
Open

Profile Layout Aligned and Controls Optimized #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions userinterface/Views/Controls/DualColumnLabelFieldView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,33 @@
<Setter Property="FontWeight" Value="Medium" />
<Setter Property="Margin" Value="0,0,8,0" />
</Style>

<Style Selector="Grid.FieldRow">
<Setter Property="Margin" Value="0,4" />
</Style>
</UserControl.Styles>

<StackPanel x:Name="MainStackPanel" Orientation="Vertical" Spacing="8">
<StackPanel x:Name="MainStackPanel" Spacing="12" Grid.IsSharedSizeScope="True">
<ItemsControl ItemsSource="{Binding Fields}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:FieldItemViewModel">
<Grid Classes="FieldRow">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding $parent[UserControl].((vm:DualColumnLabelFieldViewModel)DataContext).LabelWidth}" />
<ColumnDefinition Width="Auto" SharedSizeGroup="FieldLabel"/>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0"
Classes="FieldLabel"
Text="{Binding Label}"
ToolTip.Tip="{Binding Label}" />
Classes="FieldLabel"
Text="{Binding Label}"
ToolTip.Tip="{Binding Label}"
MaxWidth="240"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"
VerticalAlignment="Center"/>
<ContentPresenter Grid.Column="1"
Content="{Binding InputControl}"
HorizontalAlignment="Stretch"
VerticalAlignment="Center" />
Content="{Binding InputControl}"
HorizontalAlignment="Stretch"
VerticalAlignment="Center" />
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
Expand Down
26 changes: 16 additions & 10 deletions userinterface/Views/Controls/EditableBoolView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,24 @@
</Style>
</UserControl.Styles>

<Grid ColumnDefinitions="*,*" Margin="8">
<Grid Margin="8" Grid.IsSharedSizeScope="True">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="FieldLabel"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>

<TextBlock Grid.Column="0"
x:Name="NameTextBlock"
HorizontalAlignment="Left"
VerticalAlignment="Center"
TextWrapping="Wrap"
Text="{Binding Name}"
Margin="0,0,12,0" />
x:Name="NameTextBlock"
MaxWidth="240"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"
ToolTip.Tip="{Binding Name}"
Text="{Binding Name}"
VerticalAlignment="Center"/>

<CheckBox Grid.Column="1"
HorizontalAlignment="Right"
VerticalAlignment="Center"
IsChecked="{Binding ValueInDisplay}" />
HorizontalAlignment="Left"
VerticalAlignment="Center"
IsChecked="{Binding ValueInDisplay}" />
</Grid>
</UserControl>
4 changes: 3 additions & 1 deletion userinterface/Views/Controls/EditableFieldView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
KeyDown="TextBox_KeyDown"
LostFocus="LostFocusHandler"
TextChanged="TextChangedHandler"
TextWrapping="Wrap"
TextWrapping="NoWrap"
MinWidth="80"
HorizontalAlignment="Stretch"
Text="{Binding ValueText, UpdateSourceTrigger=PropertyChanged}" />
</UserControl>
25 changes: 15 additions & 10 deletions userinterface/Views/Controls/NamedEditableFieldView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,23 @@
</Style>
</UserControl.Styles>

<Grid ColumnDefinitions="Auto,*" Margin="0,2,0,2">
<Grid Grid.IsSharedSizeScope="True">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="FieldLabel"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0"
x:Name="FieldNameTextBlock"
HorizontalAlignment="Left"
VerticalAlignment="Center"
TextWrapping="Wrap"
Text="{Binding Name}"
Margin="0,0,0,0" />
x:Name="FieldNameTextBlock"
MaxWidth="240"
TextTrimming="CharacterEllipsis"
VerticalAlignment="Center"
TextWrapping="NoWrap"
Text="{Binding Name}"
ToolTip.Tip="{Binding Name}"/>

<ContentControl Grid.Column="1"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Content="{Binding Field}" />
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Content="{Binding Field}" />
</Grid>
</UserControl>
47 changes: 37 additions & 10 deletions userinterface/Views/Profile/ProfileSettingsView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,44 @@
</Style>
</UserControl.Styles>
<ScrollViewer>
<StackPanel Orientation="Vertical"
HorizontalAlignment="Stretch"
Margin="16"
Spacing="12">
<Grid Classes="FormRow" ColumnDefinitions="200,*">
<TextBlock Grid.Column="0" Text="{ext:Localized ProfileOutputDPI}"/>
<ContentControl Grid.Column="1" Content="{Binding OutputDPIField}"/>
<StackPanel Spacing="12" Grid.IsSharedSizeScope="True">
<!-- Output DPI -->
<Grid Classes="FormRow">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="FieldLabel"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>

<TextBlock Grid.Column="0"
MaxWidth="240"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"
VerticalAlignment="Center"
Text="{ext:Localized ProfileOutputDPI}"/>

<ContentControl Grid.Column="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Content="{Binding OutputDPIField}"/>
</Grid>
<Grid Classes="FormRow" ColumnDefinitions="200,*">
<TextBlock Grid.Column="0" Text="{ext:Localized ProfileYXRatio}"/>
<ContentControl Grid.Column="1" Content="{Binding YXRatioField}"/>
<!-- YX Ratio -->
<Grid Classes="FormRow">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="FieldLabel"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>

<TextBlock Grid.Column="0"
MaxWidth="240"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"
VerticalAlignment="Center"
Text="{ext:Localized ProfileYXRatio}"/>

<ContentControl Grid.Column="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Content="{Binding YXRatioField}"/>
</Grid>
<ContentControl Content="{Binding AccelerationSettings}"/>
<ContentControl Content="{Binding HiddenSettings}"/>
Expand Down
32 changes: 19 additions & 13 deletions userinterface/Views/Profile/ProfileView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,23 @@
</Style>
</UserControl.Styles>

<Grid ColumnDefinitions="3*,7*">
<Border Grid.Column="0"
Classes="SectionBorder"
Margin="0,0,8,0">
<ContentControl Content="{Binding Settings}"/>
</Border>

<Border Grid.Column="1"
Classes="SectionBorder"
Margin="8,0,0,0">
<ContentControl Content="{Binding Chart}"/>
</Border>
</Grid>
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled">
<Grid ColumnSpacing="16">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MinWidth="360"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<!-- Settings -->
<Border Grid.Column="0"
Classes="SectionBorder">
<ContentControl Content="{Binding Settings}"/>
</Border>
<!-- Chart -->
<Border Grid.Column="1"
Classes="SectionBorder"
Width="620" MinWidth="520" MaxWidth="820">
<ContentControl Content="{Binding Chart}"/>
</Border>
</Grid>
</ScrollViewer>
</UserControl>