From 330a4d62384811284479d7a19720386393f78b5a Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Fri, 14 Jun 2024 12:07:50 +0200
Subject: [PATCH] -cambio grafica pagina pdf preview

---
 .../QParameter_ConfigurationPageV.xaml        |  4 +-
 .../ItemParamList/QParamListV.xaml            |  5 +--
 .../SceneHost/MySceneHostVM.vb                |  2 -
 .../Statistics/OnlyProdPDFEditorV.xaml        |  9 +++--
 .../Statistics/PDFEditorV.xaml                |  2 +-
 .../Utility/Dictionary.xaml                   | 39 +++++++++++--------
 6 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml
index b5662498..622874ea 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml
@@ -34,7 +34,7 @@
                   <Setter Property="Template">
                      <Setter.Value>
                         <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
+                           <Expander IsExpanded="True" Style="{x:Null}">
                               <Expander.Background>
                                  <SolidColorBrush Color="#FFBABABA"></SolidColorBrush>
                               </Expander.Background>
@@ -57,7 +57,7 @@
                   <Setter Property="Template">
                      <Setter.Value>
                         <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
+                           <Expander IsExpanded="True" Style="{x:Null}">
                               <Expander.Background>
                                  <SolidColorBrush Color="LightGray"></SolidColorBrush>
                               </Expander.Background>
diff --git a/EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml b/EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml
index 1a62912f..5f018ba2 100644
--- a/EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml
+++ b/EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml
@@ -10,10 +10,7 @@
           ScrollViewer.CanContentScroll="True" 
           ScrollViewer.VerticalScrollBarVisibility="Auto"
           ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-          Margin="0,0,0,5"
-          Style="{StaticResource DataGrid_OnlyProd}"
-          RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
-          CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
+          Margin="0,0,0,5">
    <DataGrid.Columns>
 
       <!--BWType-->
diff --git a/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb b/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb
index 04da2cb2..a5239e9e 100644
--- a/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb
@@ -985,9 +985,7 @@ Public Class MySceneHostVM
          Dim bAlignMoved As Boolean = False
          Dim bSnapMoved As Boolean = False
          If m_bMagnetic Then
-            'If Not GetLockOnRotation(nMoveId) Then
             EgtAlignPartOnCollision(nMoveId, bReducedCut, bAlignMoved)
-            'End If
             If m_dSnapDist > EPS_SMALL Then
                EgtRestoreCollInfo()
                EgtMovePartToSnapPointOnCollision(nMoveId, bReducedCut, m_dSnapDist, bSnapMoved)
diff --git a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml
index f6c8517e..50fcddad 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml
@@ -16,7 +16,8 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <GroupBox Header="PDF Preview"
-                Style="{StaticResource GroupBox_PDFPreview}">
+                Style="{StaticResource GroupBox_PDFPreview}"
+                Foreground="{StaticResource BeamWall_Corduroy}">
          <StackPanel Style="{StaticResource StackPanel_List}">
             <Button ToolTip="PDF Viewer - Preview"
                     Command="{Binding CreatePreviewVis_Command}"
@@ -36,7 +37,7 @@
          </StackPanel>
       </GroupBox>
       <ScrollViewer Grid.Row="1"
-                    Style="{StaticResource ScrollViewer}">
+                    Style="{StaticResource OnlyProd_ScrollViewer}">
          <ItemsControl ItemsSource="{Binding ExpanderList}"
                        Style="{StaticResource ItemsControl_ExpanderList}">
             <ItemsControl.ItemsPanel>
@@ -134,14 +135,14 @@
       </ScrollViewer>
       <GroupBox Grid.Column="1"
                 Grid.RowSpan="2"
-                Style="{StaticResource GroupBox_PDFPreview}">
+                Style="{StaticResource GroupBox_PDFPreview}"
+                Foreground="{StaticResource BeamWall_Corduroy}">
          <GroupBox.Header>
             <StackPanel Orientation="Horizontal">
                <Image Source="/Resources/PDFEditor/PDFPreview.png" Height="20" Width="20" Stretch="Uniform"/>
                <TextBlock Text="PDF" Margin="5,2,0,0"/>
             </StackPanel>
          </GroupBox.Header>
-         <!--<WebBrowser EgtBEAMWALL:WebBrowserUtility.BindableSource="{Binding WebAddress}"/>-->
          <EgtBEAMWALL:PdfViewer PdfPath="{Binding WebAddress, Mode=TwoWay}" Visibility="{Binding PdfViewer_Visibility}"/>
       </GroupBox>
    </Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/Statistics/PDFEditorV.xaml b/EgtBEAMWALL.ViewerOptimizer/Statistics/PDFEditorV.xaml
index 2a74030b..9bbb6ac3 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Statistics/PDFEditorV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Statistics/PDFEditorV.xaml
@@ -46,7 +46,7 @@
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
                <DataTemplate>
-                  <Expander Style="{StaticResource Expander_PDF}">
+                  <Expander Style="{StaticResource Expander_PDFBase}">
                      <Expander.Header>
                         <TextBlock Text="{Binding sNameCategory}"
                                    Style="{StaticResource Category_TextBlock}"/>
diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
index 18def84b..20926564 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
@@ -2153,16 +2153,6 @@
                   </Grid.RowDefinitions>
                   <Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
                   <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
-                     <!--<Border.OpacityMask>
-                                    <MultiBinding ConverterParameter="7" UpdateSourceTrigger="Default">
-                                        <MultiBinding.Converter>
-                                            <BorderGapMaskConverter/>
-                                        </MultiBinding.Converter>
-                                        <Binding ElementName="Header" Path="ActualWidth"/>
-                                        <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
-                                        <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
-                                    </MultiBinding>
-                                </Border.OpacityMask>-->
                      <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
                         <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
                      </Border>
@@ -2180,8 +2170,6 @@
    <Style x:Key="GroupBox_PDFPreview" TargetType="{x:Type GroupBox}">
       <Setter Property="Margin" Value="2.5"/>
       <Setter Property="Width" Value="Auto"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_RegentStBlue}"/>
    </Style>
 
    <!--#endregion GroupBox-->
@@ -2317,9 +2305,6 @@
       <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
       <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
       <Setter Property="HorizontalScrollBarVisibility" Value="Hidden"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
-      </Style.Resources>
    </Style>
 
    <!--#endregion ScrollViewer-->
@@ -2371,6 +2356,13 @@
       <Setter Property="Margin" Value="2.5"/>
    </Style>
 
+   <Style x:Key="Expander_PDFBase" TargetType="{x:Type Expander}" BasedOn="{x:Null}">
+      <Setter Property="IsExpanded" Value="True"/>
+      <Setter Property="VerticalContentAlignment" Value="Top"/>
+      <Setter Property="HorizontalContentAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="2.5"/>
+   </Style>
+
    <!--#endregion Expander-->
 
    <!--#region ListBox-->
@@ -2382,7 +2374,6 @@
       <Setter Property="VerticalContentAlignment" Value="Top"/>
       <Setter Property="HorizontalContentAlignment" Value="Left"/>
       <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="AlternationCount" Value="2"/>
    </Style>
 
    <!--#endregion ListBox-->
@@ -3164,7 +3155,21 @@
    </Style>
 
    <!--#endregion ProgressBar-->
-   
+
+   <!--#region ScrollViewer-->
+
+   <Style x:Key="OnlyProd_ScrollViewer" TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource {x:Type ScrollViewer}}">
+      <Setter Property="CanContentScroll" Value="True"/>
+      <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
+      <Setter Property="HorizontalScrollBarVisibility" Value="Hidden"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
+      </Style.Resources>
+   </Style>
+
+   <!--#endregion ScrollViewer-->
+
    <!--#endregion GRAFICA NUOVA PAGINA-->
    
 </ResourceDictionary>