Skip to content

Commit 553b2d5

Browse files
committed
fix: GMLSettingsWindow.xaml UI Bug
1 parent 3170229 commit 553b2d5

4 files changed

Lines changed: 4874 additions & 1984 deletions

File tree

UndertaleModTool/Windows/GMLSettingsWindow.xaml

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@
156156
<RowDefinition Height="Auto"/>
157157
<RowDefinition Height="Auto"/>
158158
<RowDefinition Height="Auto"/>
159-
<RowDefinition Height="Auto"/>
160159
</Grid.RowDefinitions>
161160
<CheckBox Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="3" Content="{loc:Loc GML_CleanupTryCatchFinally}"
162161
ToolTip="{loc:Loc GML_CleanupTryCatchFinally_Tooltip}"
@@ -176,13 +175,37 @@
176175
<CheckBox Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="3" Content="Template strings"
177176
ToolTip="If enabled, the decompiler will attempt to rewrite string()/@@string@@() as template strings."
178177
IsChecked="{Binding DecompilerSettings.CleanupTemplateStrings}"/>
179-
<CheckBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="3" Content="{loc:Loc GML_InferFunctionArgumentTypes}"
178+
</Grid>
179+
</Grid>
180+
<Separator Margin="10,0,10,0"/> <Grid Margin="10,3,10,10">
181+
<Grid.ColumnDefinitions>
182+
<ColumnDefinition Width="110"/>
183+
<ColumnDefinition Width="*" MinWidth="60"/>
184+
<ColumnDefinition Width="Auto"/>
185+
<ColumnDefinition Width="*"/>
186+
</Grid.ColumnDefinitions>
187+
<Grid.RowDefinitions>
188+
<RowDefinition Height="Auto"/>
189+
</Grid.RowDefinitions>
190+
191+
<TextBlock Grid.Row="0" Grid.Column="0" Margin="3" Text="{loc:Loc GML_AutoInfer}"/>
192+
<Grid Grid.Row="0" Grid.Column="2" Margin="3,3,3,3">
193+
<Grid.ColumnDefinitions>
194+
<ColumnDefinition Width="Auto" MinWidth="220"/>
195+
<ColumnDefinition Width="Auto" MinWidth="220"/>
196+
</Grid.ColumnDefinitions>
197+
<Grid.RowDefinitions>
198+
<RowDefinition Height="Auto"/>
199+
<RowDefinition Height="Auto"/>
200+
<RowDefinition Height="Auto"/>
201+
</Grid.RowDefinitions>
202+
<CheckBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="3" Content="{loc:Loc GML_InferFunctionArgumentTypes}"
180203
ToolTip="{loc:Loc GML_InferFunctionArgumentTypes_Tooltip}"
181204
IsChecked="{Binding DecompilerSettings.InferFunctionArgumentTypes}"/>
182-
<CheckBox Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="3" Content="{loc:Loc GML_ReverseInferVariableTypes}"
205+
<CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Margin="3" Content="{loc:Loc GML_ReverseInferVariableTypes}"
183206
ToolTip="{loc:Loc GML_ReverseInferVariableTypes_Tooltip}"
184207
IsChecked="{Binding DecompilerSettings.ReverseInferVariableTypes}"/>
185-
<CheckBox Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Margin="3" Content="{loc:Loc GML_InlinePropagateVariableTypes}"
208+
<CheckBox Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="3" Content="{loc:Loc GML_InlinePropagateVariableTypes}"
186209
ToolTip="{loc:Loc GML_InlinePropagateVariableTypes_Tooltip}"
187210
IsChecked="{Binding DecompilerSettings.InlinePropagateVariableTypes}"/>
188211
</Grid>

0 commit comments

Comments
 (0)