Meik/CustomerPanel-Test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fine-tune window rounding and align announcement/ticket layouts

Browse Source
This commit is contained in:
Meik
2026-03-05 10:35:12 +01:00
parent d954f26686
commit 5c382ffa66
3 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
MainWindow.xaml
View File

@@ -4,6 +4,7 @@
xmlns:uctrl="clr-namespace:C4IT_CustomerPanel.UserControls" xmlns:uctrl="clr-namespace:C4IT_CustomerPanel.UserControls"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:shell="clr-namespace:System.Windows.Shell;assembly=PresentationFramework"
Title="Customer Panel" Title="Customer Panel"
Height="650" Height="650"
Width="500" Width="500"
@@ -244,11 +245,24 @@
<Window.TaskbarItemInfo> <Window.TaskbarItemInfo>
<TaskbarItemInfo /> <TaskbarItemInfo />
</Window.TaskbarItemInfo> </Window.TaskbarItemInfo>
<shell:WindowChrome.WindowChrome>
<shell:WindowChrome CaptionHeight="72"
CornerRadius="18"
GlassFrameThickness="0"
ResizeBorderThickness="0"
UseAeroCaptionButtons="False" />
</shell:WindowChrome.WindowChrome>
<Grid x:Name="MainGrid" <Grid x:Name="MainGrid"
Background="{DynamicResource backgroundColor}"> Background="{DynamicResource backgroundColor}">
<DockPanel Width="{Binding ActualWidth, ElementName=Window, Mode=OneWay}" <Border CornerRadius="18"
x:Name="MainDock"> BorderThickness="1"
BorderBrush="{DynamicResource panelBorderColor}"
Background="{DynamicResource backgroundColor}"
ClipToBounds="True">
<Grid>
<DockPanel Width="{Binding ActualWidth, ElementName=Window, Mode=OneWay}"
x:Name="MainDock">
<Grid DockPanel.Dock="Top" <Grid DockPanel.Dock="Top"
x:Name="GridTop" x:Name="GridTop"
Width="{Binding ActualWidth, ElementName=Window, Mode=OneWay}" Width="{Binding ActualWidth, ElementName=Window, Mode=OneWay}"
@@ -712,12 +726,12 @@
<uctrl:Announcements x:Name="AnnouncementCtrl" <uctrl:Announcements x:Name="AnnouncementCtrl"
Canvas.Left="10" Canvas.Left="0"
Canvas.Top="10" Canvas.Top="10"
Visibility="Visible"/> Visibility="Visible"/>
<uctrl:ComputerInformation x:Name="ComputerInfoCtrl" <uctrl:ComputerInformation x:Name="ComputerInfoCtrl"
Canvas.Left="12" Canvas.Left="0"
Canvas.Top="10" Canvas.Top="10"
Visibility="Collapsed"/> Visibility="Collapsed"/>
@@ -739,13 +753,15 @@
</Canvas> </Canvas>
</StackPanel> </StackPanel>
</DockPanel> </DockPanel>
<Image Source="Resources/United-Kingdom-Flag-icon.png" <Image Source="Resources/United-Kingdom-Flag-icon.png"
Panel.ZIndex="1001" Panel.ZIndex="1001"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Stretch="None" Stretch="None"
Margin="80,0,0,140" /> Margin="80,0,0,140" />
</Grid>
</Border>
</Grid> </Grid>
</Window> </Window>

9
UserControls/Announcements.xaml
View File

@@ -24,7 +24,8 @@
x:FieldModifier="private" x:FieldModifier="private"
Grid.Column="1" Grid.Column="1"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Grid.Row="0"> Grid.Row="0"
Height="560">
<Image Source="{DynamicResource appbar_newspaper}" <Image Source="{DynamicResource appbar_newspaper}"
Width="36" Width="36"
Height="36" Height="36"
@@ -43,18 +44,18 @@
Canvas.Left="0" Canvas.Left="0"
Visibility="Visible" Visibility="Visible"
MinHeight="60" MinHeight="60"
MaxHeight="470" MaxHeight="494"
Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}" Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
HorizontalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
<StackPanel Canvas.Top="50" <StackPanel Canvas.Top="56"
Canvas.Left="0" Canvas.Left="0"
x:Name="NoAnnouncement" x:Name="NoAnnouncement"
x:FieldModifier="private" x:FieldModifier="private"
Background="Transparent" Background="Transparent"
Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}" Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
Height="58"> Height="58">
<Border Margin="2,6,2,0" <Border Margin="2,0,2,0"
BorderThickness="1" BorderThickness="1"
CornerRadius="10" CornerRadius="10"
BorderBrush="{DynamicResource cardBorderColor}" BorderBrush="{DynamicResource cardBorderColor}"

36
UserControls/Incidents.xaml
View File

@@ -56,8 +56,7 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
Canvas.Top="10"> Canvas.Top="10">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="250*" /> <RowDefinition Height="*" />
<RowDefinition Height="450" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100*" /> <ColumnDefinition Width="100*" />
@@ -69,7 +68,8 @@
<Canvas x:Name="Canvas2" <Canvas x:Name="Canvas2"
Grid.Column="1" Grid.Column="1"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Grid.Row="0"> Grid.Row="0"
Height="560">
<Image Source="{DynamicResource appbar_clipboard_variant_text}" <Image Source="{DynamicResource appbar_clipboard_variant_text}"
Width="36" Width="36"
Height="36" Height="36"
@@ -84,7 +84,7 @@
<ScrollViewer x:Name="CanvasIncident" <ScrollViewer x:Name="CanvasIncident"
Canvas.Top="56" Canvas.Top="56"
Canvas.Left="0" Canvas.Left="0"
MaxHeight="460" MaxHeight="410"
MinHeight="60" MinHeight="60"
HorizontalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
@@ -94,9 +94,9 @@
Background="Transparent" Background="Transparent"
Width="{Binding ActualWidth, ElementName=Canvas2, Mode=OneWay}" Width="{Binding ActualWidth, ElementName=Canvas2, Mode=OneWay}"
Height="58" Height="58"
Canvas.Top="50" Canvas.Top="56"
Canvas.Left="0"> Canvas.Left="0">
<Border Margin="2,6,2,0" <Border Margin="2,0,2,0"
BorderThickness="1" BorderThickness="1"
CornerRadius="10" CornerRadius="10"
BorderBrush="{DynamicResource cardBorderColor}" BorderBrush="{DynamicResource cardBorderColor}"
@@ -108,7 +108,7 @@
</StackPanel> </StackPanel>
<Button Foreground="{DynamicResource buttonTextColor}" <Button Foreground="{DynamicResource buttonTextColor}"
Style="{StaticResource ButtonStyle}" Style="{StaticResource ButtonStyle}"
Canvas.Top="450" Canvas.Top="476"
Canvas.Left="62" Canvas.Left="62"
Width="250" Width="250"
Height="40" Height="40"
@@ -117,17 +117,17 @@
x:Name="BtnCreateNewTicket" x:Name="BtnCreateNewTicket"
Click="OnCreateNewTicketClicked" Click="OnCreateNewTicketClicked"
Margin="0 70 0 0" /> Margin="0 70 0 0" />
<Image Source="{DynamicResource appbar_list_check}"
x:Name="buttonReadAllTickets"
Tag="readAllTickets"
Cursor="Hand"
PreviewMouseDown="ReadAll_PreviewMouseDown"
RenderTransformOrigin="1.536,1.429"
Height="24"
Width="24"
Canvas.Left="338"
Canvas.Top="14"
ToolTip="{x:Static resx:Resources.removeMarkups}" />
</Canvas> </Canvas>
<Image Source="{DynamicResource appbar_list_check}"
x:Name="buttonReadAllTickets"
Tag="readAllTickets"
Grid.Column="2"
Cursor="Hand"
Margin="153,10,0,8"
PreviewMouseDown="ReadAll_PreviewMouseDown"
RenderTransformOrigin="1.536,1.429"
Height="24"
Width="24"
ToolTip="{x:Static resx:Resources.removeMarkups}" />
</Grid> </Grid>
</UserControl> </UserControl>