Skip to content

Commit

Permalink
Added scrollbar to all tabs (#1344)
Browse files Browse the repository at this point in the history 
* Add scrollbar to Tweaks

* Added scrollbar to all tabs
  • Loading branch information
@munkk01
munkk01 authored Jan 3, 2024
1 parent 46fdfdf commit af6db0c
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 21 deletions.
30 changes: 19 additions & 11 deletions winutil.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4349,6 +4349,7 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
</Grid>
</TabItem>
<TabItem Header="Tweaks" Visibility="Collapsed" Name="WPFTab2">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition Width=".50*"/>
Expand Down Expand Up @@ -4475,10 +4476,12 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
</StackPanel> <!-- End of Customize Preferences Section -->
</Border>
</Grid>
</Border>
</Grid>
</ScrollViewer>
</TabItem>
<TabItem Header="Config" Visibility="Collapsed" Name="WPFTab3">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
Expand Down Expand Up @@ -4513,10 +4516,12 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
<Button Name="WPFPanelsystem" FontSize="14" Content="System Properties" HorizontalAlignment = "Left" Margin="5" Padding="20,5" Width="200"/>
<Button Name="WPFPaneluser" FontSize="14" Content="User Accounts" HorizontalAlignment = "Left" Margin="5" Padding="20,5" Width="200"/>
</StackPanel>
</Border>
</Grid>
</Border>
</Grid>
</ScrollViewer>
</TabItem>
<TabItem Header="Updates" Visibility="Collapsed" Name="WPFTab4">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
Expand All @@ -4541,10 +4546,12 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
<TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This completely disables ALL Windows Updates and is NOT RECOMMENDED.<LineBreak/><LineBreak/> However, it can be suitable if you use your system for a select purpose and do not actively browse the internet. <LineBreak/><LineBreak/>Note: Your system will be easier to hack and infect without security updates.</TextBlock>
<TextBlock Text=" " Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300"/>
</StackPanel>
</Border>
</Grid>
</Border>
</Grid>
</ScrollViewer>
</TabItem>
<TabItem Header="MicroWin" Visibility="Collapsed" Name="WPFTab5" Width="Auto" Height="Auto">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid Width="Auto" Height="Auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
Expand All @@ -4558,7 +4565,7 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
HorizontalAlignment="Stretch">
<StackPanel Name="MicrowinMain" Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Column="0" Grid.Row="0">
<StackPanel Background="Transparent" SnapsToDevicePixels="True" Margin="1">
<CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="False" Margin="1" />
<CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="False" Margin="1" Width="300" />
<TextBlock Margin="5" Padding="1" TextWrapping="Wrap" Foreground="{ComboBoxForegroundColor}">
Choose a Windows ISO file that you''ve downloaded <LineBreak/>
Check the status in the console
Expand Down Expand Up @@ -4685,10 +4692,11 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
| |-- Driver2.inf
| |-- Driver2.sys
|-- OtherFiles...
</TextBlock>
</StackPanel>
</Border>
</Grid>
</TextBlock>
</StackPanel>
</Border>
</Grid>
</ScrollViewer>
</TabItem>
</TabControl>
</Grid>
Expand Down
28 changes: 18 additions & 10 deletions xaml/inputXML.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,7 @@
</Grid>
</TabItem>
<TabItem Header="Tweaks" Visibility="Collapsed" Name="WPFTab2">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition Width=".50*"/>
Expand Down Expand Up @@ -770,10 +771,12 @@


</StackPanel> <!-- End of Customize Preferences Section -->
</Border>
</Grid>
</Border>
</Grid>
</ScrollViewer>
</TabItem>
<TabItem Header="Config" Visibility="Collapsed" Name="WPFTab3">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
Expand Down Expand Up @@ -808,10 +811,12 @@
<Button Name="WPFPanelsystem" FontSize="14" Content="System Properties" HorizontalAlignment = "Left" Margin="5" Padding="20,5" Width="200"/>
<Button Name="WPFPaneluser" FontSize="14" Content="User Accounts" HorizontalAlignment = "Left" Margin="5" Padding="20,5" Width="200"/>
</StackPanel>
</Border>
</Grid>
</Border>
</Grid>
</ScrollViewer>
</TabItem>
<TabItem Header="Updates" Visibility="Collapsed" Name="WPFTab4">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
Expand All @@ -836,10 +841,12 @@
<TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This completely disables ALL Windows Updates and is NOT RECOMMENDED.<LineBreak/><LineBreak/> However, it can be suitable if you use your system for a select purpose and do not actively browse the internet. <LineBreak/><LineBreak/>Note: Your system will be easier to hack and infect without security updates.</TextBlock>
<TextBlock Text=" " Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300"/>
</StackPanel>
</Border>
</Grid>
</Border>
</Grid>
</ScrollViewer>
</TabItem>
<TabItem Header="MicroWin" Visibility="Collapsed" Name="WPFTab5" Width="Auto" Height="Auto">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid Width="Auto" Height="Auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
Expand Down Expand Up @@ -980,10 +987,11 @@
| |-- Driver2.inf
| |-- Driver2.sys
|-- OtherFiles...
</TextBlock>
</StackPanel>
</Border>
</Grid>
</TextBlock>
</StackPanel>
</Border>
</Grid>
</ScrollViewer>
</TabItem>
</TabControl>
</Grid>
Expand Down

0 comments on commit af6db0c

Please sign in to comment.