Skip to content
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

DYN-7071: better hierarchy of Graph Elements Scale settings #15286

Merged
merged 2 commits into from
Jun 5, 2024
Merged

DYN-7071: better hierarchy of Graph Elements Scale settings #15286

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c7f1f8
reshuffle scale revit toggle location
dnenov Jun 5, 2024
14c0d86
remove unused grid row
dnenov Jun 5, 2024
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
51 changes: 26 additions & 25 deletions src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1591,11 +1591,33 @@
</Image.ToolTip>
</Image>
</Label>
</StackPanel>

</StackPanel>

<ComboBox Grid.Row="1"
Width="213"
HorizontalAlignment="Left"
ItemsSource="{Binding Path=UnitList}"
SelectedItem="{Binding Path=SelectedUnits}"
Style="{StaticResource NoBordersComboBoxStyle}"
IsEnabled="{Binding EnableManualScaleOverrides}">
</ComboBox>
<TextBlock Grid.Row="1"
x:Name="HostUnitsTextBlock"
Padding="2"
Margin="0 2"
Width="190"
FontWeight="Regular"
HorizontalAlignment="Left"
Text="{Binding HostGenericScaleUnits}"
Foreground="#888888"
Background="{StaticResource PreferencesWindowBackgroundColor}"
Visibility="{Binding EnableManualScaleOverrides, Converter={StaticResource InverseBoolToVisibilityConverter}}">
</TextBlock>

<!-- Use Revit scale toggle (only visible in DynamoRevit) -->
<StackPanel Orientation="Horizontal"
Margin="0,6,0,8"
Grid.Row="1"
Grid.Row="2"
Visibility="{Binding IsDynamoRevit, Converter={StaticResource BooleanToVisibilityConverter}}">
<ToggleButton Name="UseHostScaleUnitsToggle"
Width="{StaticResource ToggleButtonWidth}"
Expand Down Expand Up @@ -1626,28 +1648,7 @@
</Image.ToolTip>
</Image>
</Label>
</StackPanel>

<ComboBox Grid.Row="3"
dnenov marked this conversation as resolved.
Show resolved Hide resolved
Width="213"
HorizontalAlignment="Left"
ItemsSource="{Binding Path=UnitList}"
SelectedItem="{Binding Path=SelectedUnits}"
Style="{StaticResource NoBordersComboBoxStyle}"
IsEnabled="{Binding EnableManualScaleOverrides}">
</ComboBox>
<TextBlock Grid.Row="3"
x:Name="HostUnitsTextBlock"
Padding="2"
Margin="0 2"
Width="190"
FontWeight="Regular"
HorizontalAlignment="Left"
Text="{Binding HostGenericScaleUnits}"
Foreground="#888888"
Background="{StaticResource PreferencesWindowBackgroundColor}"
Visibility="{Binding EnableManualScaleOverrides, Converter={StaticResource InverseBoolToVisibilityConverter}}">
</TextBlock>
</StackPanel>

</Grid>

Expand Down
Loading