Skip to content

Commit 75a23d1

Browse files
Fix option order in setting window
order messed up when merging
1 parent 7da7e60 commit 75a23d1

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

Flow.Launcher/SettingWindow.xaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -935,6 +935,25 @@
935935
</ItemsControl>
936936
</Border>
937937

938+
<Border Margin="0,4,0,0" Style="{DynamicResource SettingGroupBox}">
939+
<ItemsControl Style="{StaticResource SettingGrid}">
940+
<StackPanel Style="{StaticResource TextPanel}">
941+
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource nodeFilePath}" />
942+
</StackPanel>
943+
<StackPanel Grid.Column="2" Orientation="Horizontal">
944+
<TextBox
945+
Width="300"
946+
Height="34"
947+
Text="{Binding Settings.PluginSettings.NodeExecutablePath, TargetNullValue='None'}" />
948+
<Button
949+
Height="34"
950+
Margin="10,0,18,0"
951+
Click="OnSelectNodePathClick"
952+
Content="{DynamicResource select}" />
953+
</StackPanel>
954+
</ItemsControl>
955+
</Border>
956+
938957
<Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
939958
<ItemsControl Style="{StaticResource SettingGrid}">
940959
<StackPanel Style="{StaticResource TextPanel}">
@@ -974,25 +993,6 @@
974993
</ItemsControl>
975994
</Border>
976995

977-
<Border Style="{DynamicResource SettingGroupBox}">
978-
<ItemsControl Style="{StaticResource SettingGrid}">
979-
<StackPanel Style="{StaticResource TextPanel}">
980-
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource nodeFilePath}" />
981-
</StackPanel>
982-
<StackPanel Grid.Column="2" Orientation="Horizontal">
983-
<TextBox
984-
Width="300"
985-
Height="34"
986-
Text="{Binding Settings.PluginSettings.NodeExecutablePath, TargetNullValue='None'}" />
987-
<Button
988-
Height="34"
989-
Margin="10,10,18,10"
990-
Click="OnSelectNodePathClick"
991-
Content="{DynamicResource select}" />
992-
</StackPanel>
993-
</ItemsControl>
994-
</Border>
995-
996996
<Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
997997
<ItemsControl Style="{StaticResource SettingGrid}">
998998
<StackPanel Style="{StaticResource TextPanel}">

0 commit comments

Comments
 (0)