Skip to content

Commit 5292464

Browse files
onesoundsonesounds
committed
Merge Dev
1 parent 16c6e8b commit 5292464

File tree

1 file changed

+50
-90
lines changed

1 file changed

+50
-90
lines changed

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 50 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,101 +1862,61 @@
18621862
</StackPanel>
18631863
</Border>
18641864

1865-
<StackPanel>
1865+
<StackPanel>
18661866

1867-
<Border
1868-
Margin="0,30,0,0"
1869-
Padding="0"
1870-
CornerRadius="5"
1871-
Style="{DynamicResource SettingGroupBox}">
1872-
<StackPanel Orientation="Vertical">
1873-
<Border
1874-
Margin="0"
1875-
BorderThickness="0"
1876-
Style="{DynamicResource SettingGroupBox}">
1877-
<ItemsControl Style="{StaticResource SettingGrid}">
1878-
<StackPanel Style="{StaticResource TextPanel}">
1879-
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Animation}" />
1880-
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource AnimationTip}" />
1881-
</StackPanel>
1882-
<ui:ToggleSwitch
1883-
Grid.Row="0"
1884-
Grid.Column="2"
1885-
Width="100"
1886-
Margin="0,0,2,0"
1887-
IsOn="{Binding UseAnimation, Mode=TwoWay}" />
1888-
<TextBlock
1889-
Grid.Column="0"
1890-
Margin="24,0,16,0"
1891-
VerticalAlignment="Center"
1892-
FontFamily="/Resources/#Segoe Fluent Icons"
1893-
FontSize="20">
1894-
&#xedb5;
1895-
</TextBlock>
1896-
</ItemsControl>
1897-
</Border>
1898-
<Separator
1899-
Width="Auto"
1900-
BorderBrush="#e5e5e5"
1901-
BorderThickness="1" />
19021867
<Border
1903-
Margin="0"
1904-
BorderThickness="0"
1868+
Margin="0,30,0,0"
1869+
Padding="0"
1870+
CornerRadius="5"
19051871
Style="{DynamicResource SettingGroupBox}">
1906-
<ItemsControl Style="{StaticResource SettingGrid}">
1907-
<StackPanel Style="{StaticResource TextPanel}">
1908-
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SoundEffect}" />
1909-
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource SoundEffectTip}" />
1910-
</StackPanel>
1911-
<ui:ToggleSwitch
1912-
Grid.Row="0"
1913-
Grid.Column="2"
1914-
Width="100"
1915-
Margin="0,0,2,0"
1916-
IsOn="{Binding UseSound, Mode=TwoWay}" />
1917-
<TextBlock
1918-
Grid.Column="0"
1919-
Margin="24,0,16,0"
1920-
VerticalAlignment="Center"
1921-
FontFamily="/Resources/#Segoe Fluent Icons"
1922-
FontSize="20">
1923-
&#xe994;
1924-
</TextBlock>
1925-
</ItemsControl>
1872+
<StackPanel Orientation="Vertical">
1873+
<Border
1874+
Margin="0"
1875+
BorderThickness="0"
1876+
Style="{DynamicResource SettingGroupBox}">
1877+
<ItemsControl Style="{StaticResource SettingGrid}">
1878+
<StackPanel Style="{StaticResource TextPanel}">
1879+
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Animation}" />
1880+
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource AnimationTip}" />
1881+
</StackPanel>
1882+
<ui:ToggleSwitch
1883+
Grid.Row="0"
1884+
Grid.Column="2"
1885+
Width="100"
1886+
Margin="0,0,2,0"
1887+
IsOn="{Binding UseAnimation, Mode=TwoWay}" />
1888+
<TextBlock Style="{StaticResource Glyph}">
1889+
&#xedb5;
1890+
</TextBlock>
1891+
</ItemsControl>
1892+
</Border>
1893+
<Separator
1894+
Width="Auto"
1895+
BorderThickness="1"
1896+
Style="{StaticResource SettingSeparatorStyle}" />
1897+
<Border
1898+
Margin="0"
1899+
BorderThickness="0"
1900+
Style="{DynamicResource SettingGroupBox}">
1901+
<ItemsControl Style="{StaticResource SettingGrid}">
1902+
<StackPanel Style="{StaticResource TextPanel}">
1903+
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SoundEffect}" />
1904+
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource SoundEffectTip}" />
1905+
</StackPanel>
1906+
<ui:ToggleSwitch
1907+
Grid.Row="0"
1908+
Grid.Column="2"
1909+
Width="100"
1910+
Margin="0,0,2,0"
1911+
IsOn="{Binding UseSound, Mode=TwoWay}" />
1912+
<TextBlock Style="{StaticResource Glyph}">
1913+
&#xe994;
1914+
</TextBlock>
1915+
</ItemsControl>
1916+
</Border>
1917+
</StackPanel>
19261918
</Border>
1927-
</StackPanel>
1928-
</Border>
19291919

1930-
<Border Margin="0,12,0,18" Style="{DynamicResource SettingGroupBox}">
1931-
<ItemsControl Style="{StaticResource SettingGrid}">
1932-
<StackPanel Style="{StaticResource TextPanel}">
1933-
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ThemeFolder}" />
1934-
</StackPanel>
1935-
<Button
1936-
Grid.Column="2"
1937-
Width="180"
1938-
Margin="0,0,18,0"
1939-
HorizontalAlignment="Center"
1940-
Click="OpenPluginFolder"
1941-
Content="{DynamicResource OpenThemeFolder}"
1942-
DockPanel.Dock="Top" />
1943-
<TextBlock
1944-
Grid.Column="0"
1945-
Margin="24,0,16,0"
1946-
VerticalAlignment="Center"
1947-
FontFamily="/Resources/#Segoe Fluent Icons"
1948-
FontSize="20">
1949-
&#xe838;
1950-
</TextBlock>
1951-
</ItemsControl>
1952-
</Border>
1953-
</StackPanel>
1954-
</StackPanel>
1955-
</Grid>
1956-
</ScrollViewer>
1957-
</Border>
1958-
</TabItem>
1959-
<StackPanel>
19601920
<Border Margin="0,12,0,12" Style="{DynamicResource SettingGroupBox}">
19611921
<ItemsControl Style="{StaticResource SettingGrid}">
19621922
<StackPanel Style="{StaticResource TextPanel}">

0 commit comments

Comments
 (0)