mirror of
https://github.com/ChrisTitusTech/winutil.git
synced 2024-11-24 11:55:31 +00:00
move scrollviewer & app buttons into uielements logic
This commit is contained in:
MyDrift
parent
7686e7fff4
commit
0467c3a7c8
@ -110,14 +110,78 @@ function Invoke-WPFUIElements {
|
||||
$border.style = $borderstyle
|
||||
$targetGrid.Children.Add($border) | Out-Null
|
||||
|
||||
# Create a StackPanel inside the Border
|
||||
# Use a DockPanel to contain both the top buttons and the main content
|
||||
$dockPanelContainer = New-Object Windows.Controls.DockPanel
|
||||
$border.Child = $dockPanelContainer
|
||||
|
||||
# Check if configVariable equals $sync.configs.applications
|
||||
if ($configVariable -eq $sync.configs.applications) {
|
||||
# Create the StackPanel with buttons at the top inside the border
|
||||
$stackPanelTop = New-Object Windows.Controls.StackPanel
|
||||
$stackPanelTop.Background = $window.FindResource("MainBackgroundColor") # Dynamic resource for the background
|
||||
$stackPanelTop.Orientation = "Horizontal"
|
||||
$stackPanelTop.HorizontalAlignment = "Left"
|
||||
$stackPanelTop.VerticalAlignment = "Top"
|
||||
$stackPanelTop.Margin = $window.FindResource("TabContentMargin") # Dynamic resource for the margin
|
||||
|
||||
# Create the buttons and add them to the StackPanel
|
||||
$installButton = New-Object Windows.Controls.Button
|
||||
$installButton.Name = "WPFInstall"
|
||||
$installButton.Content = " Install/Upgrade Selected"
|
||||
$installButton.Margin = New-Object Windows.Thickness(2)
|
||||
$stackPanelTop.Children.Add($installButton) | Out-Null
|
||||
|
||||
$upgradeButton = New-Object Windows.Controls.Button
|
||||
$upgradeButton.Name = "WPFInstallUpgrade"
|
||||
$upgradeButton.Content = " Upgrade All"
|
||||
$upgradeButton.Margin = New-Object Windows.Thickness(2)
|
||||
$stackPanelTop.Children.Add($upgradeButton) | Out-Null
|
||||
|
||||
$uninstallButton = New-Object Windows.Controls.Button
|
||||
$uninstallButton.Name = "WPFUninstall"
|
||||
$uninstallButton.Content = " Uninstall Selected"
|
||||
$uninstallButton.Margin = New-Object Windows.Thickness(2)
|
||||
$stackPanelTop.Children.Add($uninstallButton) | Out-Null
|
||||
|
||||
$getInstalledButton = New-Object Windows.Controls.Button
|
||||
$getInstalledButton.Name = "WPFGetInstalled"
|
||||
$getInstalledButton.Content = " Get Installed"
|
||||
$getInstalledButton.Margin = New-Object Windows.Thickness(2)
|
||||
$stackPanelTop.Children.Add($getInstalledButton) | Out-Null
|
||||
|
||||
$clearSelectionButton = New-Object Windows.Controls.Button
|
||||
$clearSelectionButton.Name = "WPFClearInstallSelection"
|
||||
$clearSelectionButton.Content = " Clear Selection"
|
||||
$clearSelectionButton.Margin = New-Object Windows.Thickness(2)
|
||||
$stackPanelTop.Children.Add($clearSelectionButton) | Out-Null
|
||||
|
||||
# Dock the top StackPanel at the top of the DockPanel
|
||||
[Windows.Controls.DockPanel]::SetDock($stackPanelTop, [Windows.Controls.Dock]::Top)
|
||||
$dockPanelContainer.Children.Add($stackPanelTop) | Out-Null
|
||||
}
|
||||
|
||||
# Create a ScrollViewer to contain the main content (excluding buttons)
|
||||
$scrollViewer = New-Object Windows.Controls.ScrollViewer
|
||||
$scrollViewer.VerticalScrollBarVisibility = 'Auto'
|
||||
$scrollViewer.HorizontalScrollBarVisibility = 'Auto'
|
||||
$scrollViewer.HorizontalAlignment = 'Stretch'
|
||||
$scrollViewer.VerticalAlignment = 'Stretch'
|
||||
|
||||
# Create a StackPanel inside the ScrollViewer for application content
|
||||
$stackPanel = New-Object Windows.Controls.StackPanel
|
||||
$stackPanel.Background = [Windows.Media.Brushes]::Transparent
|
||||
$stackPanel.SnapsToDevicePixels = $true
|
||||
$stackPanel.VerticalAlignment = "Stretch" # Ensure the stack panel stretches vertically
|
||||
$border.Child = $stackPanel
|
||||
$stackPanel.Orientation = "Vertical"
|
||||
$stackPanel.HorizontalAlignment = 'Stretch'
|
||||
$stackPanel.VerticalAlignment = 'Stretch'
|
||||
|
||||
# Add the StackPanel to the ScrollViewer
|
||||
$scrollViewer.Content = $stackPanel
|
||||
|
||||
# Add the ScrollViewer to the DockPanel (it will be below the top buttons StackPanel)
|
||||
[Windows.Controls.DockPanel]::SetDock($scrollViewer, [Windows.Controls.Dock]::Bottom)
|
||||
$dockPanelContainer.Children.Add($scrollViewer) | Out-Null
|
||||
$panelcount++
|
||||
|
||||
# Now proceed with adding category labels and entries to $stackPanel (as before)
|
||||
foreach ($category in ($organizedData[$panelKey].Keys | Sort-Object)) {
|
||||
$count++
|
||||
|
||||
|
||||
@ -917,23 +917,7 @@
|
||||
<TabItem Header="Install" Visibility="Collapsed" Name="WPFTab1">
|
||||
<Grid Background="Transparent" >
|
||||
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="45px"/>
|
||||
<RowDefinition Height="0.95*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<StackPanel Background="{DynamicResource MainBackgroundColor}" Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3" Margin="{DynamicResource TabContentMargin}">
|
||||
<Button Name="WPFInstall" Content=" Install/Upgrade Selected" Margin="2" />
|
||||
<Button Name="WPFInstallUpgrade" Content=" Upgrade All" Margin="2"/>
|
||||
<Button Name="WPFUninstall" Content=" Uninstall Selected" Margin="2"/>
|
||||
<Button Name="WPFGetInstalled" Content=" Get Installed" Margin="2"/>
|
||||
<Button Name="WPFClearInstallSelection" Content=" Clear Selection" Margin="2"/>
|
||||
<CheckBox Name="WPFpreferChocolatey" VerticalAlignment="Center" VerticalContentAlignment="Center">
|
||||
<TextBlock Text="Prefer Chocolatey" ToolTip="Prefers Chocolatey as Download Engine instead of Winget" VerticalAlignment="Center" />
|
||||
</CheckBox>
|
||||
</StackPanel>
|
||||
|
||||
|
||||
<Grid Grid.Row="1" Grid.Column="0" Margin="{DynamicResource TabContentMargin}">
|
||||
<Grid Grid.Row="0" Grid.Column="0" Margin="{DynamicResource TabContentMargin}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*" />
|
||||
<ColumnDefinition Width="3*" />
|
||||
@ -942,13 +926,11 @@
|
||||
<Grid Name="appscategory" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
|
||||
</Grid>
|
||||
|
||||
<ScrollViewer x:Name="scrollViewer" Grid.Column="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" BorderBrush="Transparent" BorderThickness="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
|
||||
<Grid Name="appspanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
|
||||
<Grid Name="appspanel" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</Grid>
|
||||
|
||||
<Rectangle Grid.Row="1" Grid.Column="0" Width="22" Height="22" Fill="{DynamicResource MainBackgroundColor}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Style="{StaticResource ScrollVisibilityRectangle}"/>
|
||||
<Rectangle Grid.Row="0" Grid.Column="0" Width="22" Height="22" Fill="{DynamicResource MainBackgroundColor}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Style="{StaticResource ScrollVisibilityRectangle}"/>
|
||||
|
||||
</Grid>
|
||||
</TabItem>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user