- work in progress

2023-03-03 15:08:27 +01:00
parent 08088592f9
commit 2a248795b1
10 changed files with 235 additions and 20 deletions
@@ -80,6 +80,9 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
    </Reference>
+    <Reference Include="EgtWPFLib48">
+      <HintPath>..\..\..\EgtProg\DllD64\EgtWPFLib48.dll</HintPath>
+    </Reference>
    <Reference Include="EgtWPFLib5, Version=2.4.5.1, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\EgtProg\DllD32\EgtWPFLib5.dll</HintPath>
@@ -787,6 +790,14 @@
  <ItemGroup>
    <Resource Include="Resources\ViewPanel\LookFromISO_SE.png" />
  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Common\Close.png" />
+    <Resource Include="Resources\Common\Maximize.png" />
+    <Resource Include="Resources\Common\Minimize.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Common\Restore.png" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <PropertyGroup>
    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe
@@ -1,15 +1,15 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
+<EgtWPFLib48:EgtMainWindow x:Class="MainWindowV"
                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtWPFLib48="clr-namespace:EgtWPFLib48;assembly=EgtWPFLib48"
                            xmlns:PrintApp="clr-namespace:Icarus"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Style="{DynamicResource {x:Type EgtWPFLib48:EgtMainWindow}}"
                            Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
-                            MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
+                            MinHeight="600" MinWidth="800"
                            AllowDrop="True" Drop="MainWindowV_Drop"
                            ShowInTaskbar="True"
-                            Topmost="False"
-                            CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
+                            Topmost="False">
   <!--<EgtWPFLib5:EgtCustomWindow.TitlePanel>

      <PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
@@ -33,4 +33,4 @@

   </DockPanel>-->

-</EgtWPFLib5:EgtCustomWindow>
+</EgtWPFLib48:EgtMainWindow>
@@ -20,6 +20,8 @@ Class MainWindowV
      AddHandler Me.Closing, AddressOf MainWindowV_Closing
      AddHandler Me.KeyDown, AddressOf MainWindowV_KeyDown
      AddHandler Me.StateChanged, AddressOf MainWindowV_StateChanged
+      AddHandler Me.LocationChanged, AddressOf MainWindowV_LocationChanged
+      AddHandler Me.SizeChanged, AddressOf MainWindowV_SizeChanged
   End Sub

 #End Region    ' CONSTRUCTOR
@@ -64,6 +66,19 @@ Class MainWindowV
      End If
   End Sub

+   Private Sub MainWindowV_LocationChanged(sender As Object, e As EventArgs)
+      If Not IsNothing(Map.refSecondaryWindowV) Then Map.refSecondaryWindowV.Top = Me.Top
+      If Not IsNothing(Map.refSecondaryWindowV) Then Map.refSecondaryWindowV.Left = Me.Left
+   End Sub
+
+   Private Sub MainWindowV_SizeChanged(sender As Object, e As SizeChangedEventArgs)
+      If Not IsNothing(Map.refSecondaryWindowV) Then
+         If e.WidthChanged Then Map.refSecondaryWindowV.Width = e.NewSize.Width
+         If e.HeightChanged Then Map.refSecondaryWindowV.Height = e.NewSize.Height
+         Map.refSecondaryWindowV.InvalidateVisual()
+      End If
+   End Sub
+
   Private Sub MainWindowV_StateChanged(sender As Object, e As EventArgs)
      If Not IsNothing(Map.refSecondaryWindowV) AndAlso Not Map.refSecondaryWindowV.WindowChangingState Then
         Map.refSecondaryWindowV.WindowState = Me.WindowState
@@ -1,24 +1,21 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="SecondaryWindowV"
+<EgtWPFLib48:EgtMainWindow x:Class="SecondaryWindowV"
                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtWPFLib48="clr-namespace:EgtWPFLib48;assembly=EgtWPFLib48"
                            xmlns:PrintApp="clr-namespace:Icarus"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
-                            WindowStyle="None" ResizeMode="NoResize"
+                            Style="{StaticResource NoStyle_Window}"
+                            Title="{Binding sTitle}"
+                            WindowStyle="None"
                            ShowInTaskbar="False"
                            AllowsTransparency="True"
                            Background="Transparent"
-                            AboutBoxCommand="{Binding AboutBoxCommand}"
-                            CloseCommand="{Binding CloseApplicationCommand,
-                                                   Mode=OneWay,
-                                                   UpdateSourceTrigger=PropertyChanged}"
                            >
-   <EgtWPFLib5:EgtCustomWindow.TitlePanel>
+   <!--<EgtWPFLib5:EgtCustomWindow.TitlePanel>

      <PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>

-   </EgtWPFLib5:EgtCustomWindow.TitlePanel>
+   </EgtWPFLib5:EgtCustomWindow.TitlePanel>-->

   <!--Pannello principale -->
   <DockPanel>
@@ -29,4 +26,4 @@

   <!--<PrintApp:SceneHostV/>-->
   
-</EgtWPFLib5:EgtCustomWindow>
+</EgtWPFLib48:EgtMainWindow>
@@ -22,8 +22,8 @@ Public Class SecondaryWindowV
      AddHandler Me.ContentRendered, AddressOf SecondaryWindowV_ContentRendered
      AddHandler Me.Loaded, AddressOf SecondaryWindowV_Loaded
      AddHandler Me.Closing, AddressOf SecondaryWindowV_Closing
-      AddHandler Me.LocationChanged, AddressOf SecondaryWindowV_LocationChanged
-      AddHandler Me.SizeChanged, AddressOf SecondaryWindowV_SizeChanged
+      'AddHandler Me.LocationChanged, AddressOf SecondaryWindowV_LocationChanged
+      'AddHandler Me.SizeChanged, AddressOf SecondaryWindowV_SizeChanged
      AddHandler Me.StateChanged, AddressOf SecondaryWindowV_StateChanged
   End Sub

@@ -3,6 +3,7 @@
                    xmlns:PrintApp="clr-namespace:Icarus"
                    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2"
                    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                    xmlns:EgtWPFLib48="clr-namespace:EgtWPFLib48;assembly=EgtWPFLib48"
                    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
@@ -810,7 +811,7 @@
      <Setter Property="FontWeight" Value="Bold"/>
      <Setter Property="HorizontalAlignment" Value="Left"/>
   </Style>
-   
+
   <Style x:Key="Move_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
      <Setter Property="VerticalAlignment" Value="Center"/>
   </Style>
@@ -4006,4 +4007,195 @@

   <!-- ______________________________________________________________________________________________________________________________________________ -->

+   <!--EgtMainWindow-->
+
+   <Style TargetType="{x:Type Button}" x:Key="WindowButtonStyle">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ButtonBase}">
+               <Border x:Name="Chrome"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       Margin="0"
+                       Background="{TemplateBinding Background}"
+                       SnapsToDevicePixels="True">
+                  <ContentPresenter
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                Margin="{TemplateBinding Padding}"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="FontFamily" Value="Webdings"/>
+      <Setter Property="FontSize" Value="13.333" />
+      <Setter Property="Foreground" Value="Black" />
+      <Setter Property="Margin" Value="0,2,3,0"/>
+      <Style.Triggers>
+         <Trigger Property="IsMouseOver" Value="True">
+            <Setter Property="Foreground" Value="Gray" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style TargetType="{x:Type EgtWPFLib48:EgtMainWindow}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush" Value="Black"/>
+      <Setter Property="MinHeight" Value="320"/>
+      <Setter Property="MinWidth" Value="480"/>
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
+      <Setter Property="Title" Value="{Binding Title}"/>
+      <Setter Property="WindowChrome.WindowChrome">
+         <Setter.Value>
+            <WindowChrome GlassFrameThickness="1" 
+                          ResizeBorderThickness="4"
+                          CaptionHeight="0"/>
+         </Setter.Value>
+      </Setter>
+
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type EgtWPFLib48:EgtMainWindow}">
+
+               <Grid Background="Transparent" x:Name="WindowRoot">
+
+                  <Grid x:Name="LayoutRoot"
+                              Background="{TemplateBinding Background}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+
+                     <!--TitleBar-->
+                     <Grid x:Name="PART_HeaderBar">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Button Command="{Binding AboutBoxCommand}"
+                                Style="{StaticResource ProjManager_Button}">
+                           <Image Source="{TemplateBinding Icon}"/>
+                        </Button>
+                        <Grid Grid.Column="1">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                           </Grid.ColumnDefinitions>
+                           <PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
+                           <TextBlock Text="{TemplateBinding ProjectName}" 
+                                      ToolTip="{TemplateBinding ProjectNamePath}"
+                                      Grid.Column="1"
+                                      TextTrimming="CharacterEllipsis"
+                                      FontSize="14"
+                                      VerticalAlignment="Center"
+                                      Foreground="{StaticResource Icarus_Gray}"
+                                      IsEnabled="{TemplateBinding IsActive}"/>
+                           <TextBlock Text="{TemplateBinding Title}" 
+                                      Grid.Column="2"
+                                      TextTrimming="CharacterEllipsis"
+                                      HorizontalAlignment="Stretch" 
+                                      FontSize="14"
+                                      TextAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Width="Auto"
+                                      Foreground="{StaticResource Icarus_Gray}"
+                                      Panel.ZIndex="0"
+                                      IsEnabled="{TemplateBinding IsActive}"/>
+                        </Grid>
+
+                        <Grid x:Name="WindowControlsGrid" 
+                              Grid.Column="2" 
+                              Background="White">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+
+                           <Button x:Name="MinimizeButton"
+                                   Style="{StaticResource ProjManager_Button}">
+                              <Image Source="\Resources\Common\Minimize.png"/>
+                           </Button>
+                           <Button x:Name="MaximizeButton"
+                                   Grid.Column="1"
+                                   Style="{StaticResource ProjManager_Button}">
+                              <Image Source="\Resources\Common\Maximize.png"/>
+                           </Button>
+                           <Button x:Name="RestoreButton"
+                                   Grid.Column="1"
+                                   Visibility="Collapsed"
+                                   Style="{StaticResource ProjManager_Button}">
+                              <Image Source="\Resources\Common\Restore.png"/>
+                           </Button>
+                           <Button x:Name="CloseButton"
+                                   Grid.Column="2"
+                                   Command="{Binding CloseApplicationCommand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                   Style="{StaticResource ProjManager_Button}">
+                              <Image Source="\Resources\Common\Close.png"/>
+                           </Button>
+                        </Grid>
+                     </Grid>
+
+                     <Grid x:Name="PART_MainContentGrid"
+                           Grid.Row="1"
+                           Panel.ZIndex="10">
+                        <ContentPresenter x:Name="PART_MainContentPresenter"/>
+                     </Grid>
+                  </Grid>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="NoStyle_Window" TargetType="{x:Type EgtWPFLib48:EgtMainWindow}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush" Value="Black"/>
+      <Setter Property="MinHeight" Value="320"/>
+      <Setter Property="MinWidth" Value="480"/>
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
+      <Setter Property="Title" Value="{Binding Title}"/>
+      <Setter Property="WindowChrome.WindowChrome">
+         <Setter.Value>
+            <WindowChrome GlassFrameThickness="1" 
+                              ResizeBorderThickness="4"
+                              CaptionHeight="0"/>
+         </Setter.Value>
+      </Setter>
+
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type EgtWPFLib48:EgtMainWindow}">
+
+               <Grid Background="Transparent" x:Name="WindowRoot">
+
+                  <Grid x:Name="LayoutRoot"
+                              Background="{TemplateBinding Background}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="36"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+
+                     <Grid x:Name="PART_MainContentGrid"
+                                  Grid.Row="1"
+                                  Panel.ZIndex="10">
+                        <ContentPresenter x:Name="PART_MainContentPresenter" Grid.Row="1"/>
+                     </Grid>
+                  </Grid>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
 </ResourceDictionary>