Skip to content

Commit 16118e9

Browse files
marticlimentmarticliment
committed
Fix bug in animations where destination content overflowed via the ScrollViewer
1 parent a80b4e3 commit 16118e9

File tree

13 files changed

+255
-188
lines changed

13 files changed

+255
-188
lines changed

‎src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@
1515
<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
1616
</Page.Resources>
1717

18-
<StackPanel>
19-
<widgets:CheckboxCard
18+
<ScrollViewer
19+
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
20+
HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
21+
Margin="0,0,-8,0" x:Name="Scroller"
22+
Padding="0,0,8,0"
23+
>
24+
<StackPanel>
25+
<widgets:CheckboxCard
2026
x:Name="DoCacheAdminRights"
2127
Text="Ask only once for administrator privileges (not recommended)"
2228
SettingName="DoCacheAdminRights"
@@ -25,13 +31,14 @@
2531
BorderThickness="1,1,1,0"
2632
/>
2733

28-
<widgets:CheckboxCard
34+
<widgets:CheckboxCard
2935
x:Name="DoCacheAdminRightsForBatches"
3036
Text="Ask for administrator privileges once for each batch of operations"
3137
SettingName="DoCacheAdminRightsForBatches"
3238
StateChanged="RestartCache"
3339
CornerRadius="0,0,8,8"
3440
IsEnabled="{x:Bind DoCacheAdminRights._checkbox.IsOn, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
3541
/>
36-
</StackPanel>
42+
</StackPanel>
43+
</ScrollViewer>
3744
</Page>

‎src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml‎

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,63 +9,69 @@
99
mc:Ignorable="d"
1010
Background="Transparent">
1111

12-
<StackPanel Orientation="Vertical" >
13-
<widgets:CheckboxCard
12+
<ScrollViewer
13+
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
14+
HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
15+
Margin="0,0,-8,0" x:Name="Scroller"
16+
Padding="0,0,8,0"
17+
>
18+
<StackPanel Orientation="Vertical" >
19+
<widgets:CheckboxCard
1420
Text="Periodically perform a backup of the installed packages"
1521
x:Name="EnablePackageBackupCheckBox"
1622
StateChanged="ShowRestartBanner"
1723
SettingName="EnablePackageBackup"
1824
CornerRadius="8,8,0,0"
1925
/>
20-
<Toolkit:SettingsCard
26+
<Toolkit:SettingsCard
2127
BorderThickness="1,0,1,1"
2228
CornerRadius="0,0,8,8"
2329
>
24-
<Toolkit:SettingsCard.Description>
25-
<StackPanel Orientation="Vertical">
26-
<widgets:TranslatedTextBlock Prefix=" ● " Text="The backup will include the complete list of the installed packages and their installation options. Ignored updates and skipped versions will also be saved." />
27-
<widgets:TranslatedTextBlock Prefix=" ● " Text="The backup will NOT include any binary file nor any program's saved data." />
28-
<widgets:TranslatedTextBlock Prefix=" ● " Text="The size of the backup is estimated to be less than 1MB." />
29-
<widgets:TranslatedTextBlock Prefix=" ● " Text="The backup will be performed after login." />
30-
</StackPanel>
31-
</Toolkit:SettingsCard.Description>
32-
</Toolkit:SettingsCard>
30+
<Toolkit:SettingsCard.Description>
31+
<StackPanel Orientation="Vertical">
32+
<widgets:TranslatedTextBlock Prefix=" ● " Text="The backup will include the complete list of the installed packages and their installation options. Ignored updates and skipped versions will also be saved." />
33+
<widgets:TranslatedTextBlock Prefix=" ● " Text="The backup will NOT include any binary file nor any program's saved data." />
34+
<widgets:TranslatedTextBlock Prefix=" ● " Text="The size of the backup is estimated to be less than 1MB." />
35+
<widgets:TranslatedTextBlock Prefix=" ● " Text="The backup will be performed after login." />
36+
</StackPanel>
37+
</Toolkit:SettingsCard.Description>
38+
</Toolkit:SettingsCard>
3339

34-
<UserControl Height="16"/>
40+
<UserControl Height="16"/>
3541

3642

37-
<widgets:ButtonCard
43+
<widgets:ButtonCard
3844
Text="Perform a backup now"
3945
ButtonText="Backup"
4046
x:Name="BackupNowButton"
4147
CornerRadius="8"
4248
Click="DoBackup_Click"
4349
IsEnabled="{x:Bind EnablePackageBackupCheckBox._checkbox.IsOn, Mode=OneWay}"/>
4450

45-
<UserControl Height="16"/>
51+
<UserControl Height="16"/>
4652

4753

48-
<widgets:ButtonCard
54+
<widgets:ButtonCard
4955
Text="Change backup output directory"
5056
ButtonText="Select"
5157
CornerRadius="8"
5258
x:Name="ChangeBackupDirectory"
5359
Click="ChangeBackupDirectory_Click"
5460
IsEnabled="{x:Bind EnablePackageBackupCheckBox._checkbox.IsOn, Mode=OneWay}">
55-
<Toolkit:SettingsCard.Description>
56-
<StackPanel Orientation="Horizontal" Spacing="5">
57-
<TextBlock Name="BackupDirectoryLabel" VerticalAlignment="Center"/>
58-
<HyperlinkButton Name="ResetBackupDirectory" Click="ResetBackupPath_Click" />
59-
<HyperlinkButton Name="OpenBackupDirectory" Click="OpenBackupPath_Click" />
60-
</StackPanel>
61-
</Toolkit:SettingsCard.Description>
62-
</widgets:ButtonCard>
61+
<Toolkit:SettingsCard.Description>
62+
<StackPanel Orientation="Horizontal" Spacing="5">
63+
<TextBlock Name="BackupDirectoryLabel" VerticalAlignment="Center"/>
64+
<HyperlinkButton Name="ResetBackupDirectory" Click="ResetBackupPath_Click" />
65+
<HyperlinkButton Name="OpenBackupDirectory" Click="OpenBackupPath_Click" />
66+
</StackPanel>
67+
</Toolkit:SettingsCard.Description>
68+
</widgets:ButtonCard>
6369

64-
<UserControl Height="16"/>
70+
<UserControl Height="16"/>
6571

6672

6773

68-
<widgets:TextboxCard
74+
<widgets:TextboxCard
6975
Text="Set a custom backup file name"
7076
Placeholder="Leave empty for default"
7177
SettingName="ChangeBackupFileName"
@@ -74,7 +80,7 @@
7480
IsEnabled="{x:Bind EnablePackageBackupCheckBox._checkbox.IsOn, Mode=OneWay}"
7581
/>
7682

77-
<widgets:CheckboxCard
83+
<widgets:CheckboxCard
7884
Text="Add a timestamp to the backup file names"
7985
x:Name="EnableBackupTimestampingCheckBox"
8086
SettingName="EnableBackupTimestamping"
@@ -83,7 +89,8 @@
8389
/>
8490

8591

86-
8792

88-
</StackPanel>
93+
94+
</StackPanel>
95+
</ScrollViewer>
8996
</Page>

‎src/UniGetUI/Pages/SettingsPages/GeneralPages/Experimental.xaml‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@
99
mc:Ignorable="d"
1010
Background="Transparent">
1111

12-
<StackPanel Orientation="Vertical">
13-
14-
<widgets:CheckboxCard
12+
<ScrollViewer
13+
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
14+
HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
15+
Margin="0,0,-8,0" x:Name="Scroller"
16+
Padding="0,0,8,0"
17+
>
18+
<StackPanel Orientation="Vertical">
19+
20+
<widgets:CheckboxCard
1521
x:Name="DisableWidgetsApi"
1622
Text="Enable background api (WingetUI Widgets and Sharing, port 7058)"
1723
SettingName="DisableApi"
@@ -20,44 +26,44 @@
2026
BorderThickness="1,1,1,0"
2127
/>
2228

23-
<widgets:CheckboxCard
29+
<widgets:CheckboxCard
2430
x:Name="DisableWaitForInternetConnection"
2531
Text="Wait for the device to be connected to the internet before attempting to do tasks that require internet connectivity."
2632
SettingName="DisableWaitForInternetConnection"
2733
StateChanged="ShowRestartBanner"
2834
CornerRadius="0,0,8,8"
2935
/>
3036

31-
<UserControl Height="16"/>
37+
<UserControl Height="16"/>
3238

33-
<widgets:CheckboxCard
39+
<widgets:CheckboxCard
3440
Text="Disable the 1-minute timeout for package-related operations"
3541
ForceInversion="True"
3642
SettingName="DisableTimeoutOnPackageListingTasks"
3743
CornerRadius="8"
3844
/>
3945

40-
<UserControl Height="16"/>
46+
<UserControl Height="16"/>
4147

42-
<widgets:CheckboxCard
48+
<widgets:CheckboxCard
4349
x:Name="DisableUniGetUIElevatorToggle"
4450
Text="Enable the new UniGetUI-Branded UAC Elevator"
4551
SettingName="DisableUniGetUIElevator"
4652
StateChanged="ShowRestartBanner"
4753
CornerRadius="8,8,0,0"
4854
BorderThickness="1,1,1,0"
4955
/>
50-
<widgets:CheckboxCard
56+
<widgets:CheckboxCard
5157
x:Name="UseUserGSudoToggle"
5258
Text="Use installed GSudo instead of the bundled one"
5359
SettingName="UseUserGSudo"
5460
StateChanged="ShowRestartBanner"
5561
CornerRadius="0,0,8,8"
5662
/>
5763

58-
<UserControl Height="16"/>
64+
<UserControl Height="16"/>
5965

60-
<widgets:CheckboxCard
66+
<widgets:CheckboxCard
6167
x:Name="DisableDownloadingNewTranslations"
6268
Text="Download updated language files from GitHub automatically"
6369
SettingName="DisableLangAutoUpdater"
@@ -66,7 +72,7 @@
6672
BorderThickness="1,1,1,0"
6773
/>
6874

69-
<widgets:TextboxCard
75+
<widgets:TextboxCard
7076
Text="Use a custom icon and screenshot database URL"
7177
Placeholder="Leave empty for default"
7278
SettingName="IconDataBaseURL"
@@ -75,13 +81,14 @@
7581
CornerRadius="0,0,8,8"
7682
/>
7783

78-
<UserControl Height="16"/>
79-
80-
<widgets:CheckboxCard
84+
<UserControl Height="16"/>
85+
86+
<widgets:CheckboxCard
8187
Name="DisableDMWThreadOptimizations"
8288
SettingName="DisableDMWThreadOptimizations"
8389
Text="Enable background CPU Usage optimizations (see Pull Request #3278)"
8490
CornerRadius="8"
8591
/>
86-
</StackPanel>
92+
</StackPanel>
93+
</ScrollViewer>
8794
</Page>

‎src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,74 +9,81 @@
99
mc:Ignorable="d"
1010
Background="Transparent">
1111

12-
<StackPanel Spacing="0" Orientation="Vertical">
13-
<widgets:ComboboxCard
12+
<ScrollViewer
13+
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
14+
HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
15+
Margin="0,0,-8,0" x:Name="Scroller"
16+
Padding="0,0,8,0"
17+
>
18+
<StackPanel Spacing="0" Orientation="Vertical">
19+
<widgets:ComboboxCard
1420
x:Name="LanguageSelector"
1521
Text="WingetUI display language:"
1622
SettingName="PreferredLanguage"
1723
ValueChanged="ShowRestartBanner"
1824
CornerRadius="8"
1925
>
20-
<Toolkit:SettingsCard.Description>
21-
<StackPanel Orientation="Horizontal" Spacing="4">
22-
<widgets:TranslatedTextBlock Text="Is your language missing or incomplete?" Opacity=".8" VerticalAlignment="Center"/>
23-
<HyperlinkButton
26+
<Toolkit:SettingsCard.Description>
27+
<StackPanel Orientation="Horizontal" Spacing="4">
28+
<widgets:TranslatedTextBlock Text="Is your language missing or incomplete?" Opacity=".8" VerticalAlignment="Center"/>
29+
<HyperlinkButton
2430
Padding="0"
2531
NavigateUri="https://github.com/marticliment/WingetUI/wiki#translating-wingetui">
26-
<widgets:TranslatedTextBlock Text="Become a translator"/>
27-
</HyperlinkButton>
28-
</StackPanel>
29-
</Toolkit:SettingsCard.Description>
30-
</widgets:ComboboxCard>
31-
<!--widgets:ButtonCard
32+
<widgets:TranslatedTextBlock Text="Become a translator"/>
33+
</HyperlinkButton>
34+
</StackPanel>
35+
</Toolkit:SettingsCard.Description>
36+
</widgets:ComboboxCard>
37+
<!--widgets:ButtonCard
3238
Text="Open the welcome wizard"
3339
ButtonText="Open"
3440
Click="OpenWelcomeWizard"
3541
IsEnabled="False"
3642
/-->
37-
<UserControl Height="16"/>
43+
<UserControl Height="16"/>
3844

39-
<widgets:CheckboxButtonCard
45+
<widgets:CheckboxButtonCard
4046
CheckboxText="Update WingetUI automatically"
4147
ButtonText="Check for updates"
4248
SettingName="DisableAutoUpdateWingetUI"
4349
ButtonAlwaysOn="true"
4450
Click="ForceUpdateUniGetUI_OnClick"
4551
CornerRadius="8,8,0,0"
4652
/>
47-
<widgets:CheckboxCard
53+
<widgets:CheckboxCard
4854
Text="Install prerelease versions of UniGetUI"
4955
SettingName="EnableUniGetUIBeta"
5056
CornerRadius="0,0,8,8"
5157
BorderThickness="1,0,1,1"
5258
/>
53-
<UserControl Height="16"/>
59+
<UserControl Height="16"/>
5460

55-
<widgets:ButtonCard
61+
<widgets:ButtonCard
5662
Text="Manage telemetry settings"
5763
ButtonText="Manage"
5864
Click="ManageTelemetrySettings_Click"
5965
CornerRadius="8"
6066
/>
61-
<UserControl Height="16"/>
67+
<UserControl Height="16"/>
6268

63-
<widgets:ButtonCard
69+
<widgets:ButtonCard
6470
Text="Import settings from a local file"
6571
ButtonText="Import"
6672
Click="ImportSettings"
6773
CornerRadius="8,8,0,0"
6874
/>
69-
<widgets:ButtonCard
75+
<widgets:ButtonCard
7076
Text="Export settings to a local file"
7177
ButtonText="Export"
7278
Click="ExportSettings"
7379
CornerRadius="0" BorderThickness="1,0"
7480
/>
75-
<widgets:ButtonCard
81+
<widgets:ButtonCard
7682
Text="Reset WingetUI"
7783
ButtonText="Reset UniGetUI"
7884
Click="ResetWingetUI"
7985
CornerRadius="0,0,8,8"
8086
/>
81-
</StackPanel>
87+
</StackPanel>
88+
</ScrollViewer>
8289
</Page>

0 commit comments

Comments
 (0)