From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Tango.Scripting.Editors/Themes/Generic.xaml    | 107 +++++++++++++++++----
 1 file changed, 89 insertions(+), 18 deletions(-)

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes')

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml
index 5de763df3..ce5cb39e1 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml
@@ -47,19 +47,12 @@
     <BitmapImage x:Key="namespace" UriSource="pack://application:,,,/Tango.Scripting.Editors;component/Images/namespace.png" />
     <BitmapImage x:Key="method" UriSource="pack://application:,,,/Tango.Scripting.Editors;component/Images/method.png" />
     <BitmapImage x:Key="property" UriSource="pack://application:,,,/Tango.Scripting.Editors;component/Images/property.png" />
-    <BitmapImage x:Key="event" UriSource="pack://application:,,,/Tango.Scripting.Editors;component/Images/event.png" />
-    <BitmapImage x:Key="snippet" UriSource="pack://application:,,,/Tango.Scripting.Editors;component/Images/snippet.png" />
 
     <!--Converters-->
     <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     <converters:BooleanToVisibilityInversedConverter x:Key="BooleanToVisibilityInversedConverter" />
 
     <Style TargetType="{x:Type completion:CompletionList}">
-        <Style.Resources>
-            <Style TargetType="ToolTip">
-                
-            </Style>
-        </Style.Resources>
         <Setter Property="Background" Value="{StaticResource CompletionBackgroundBrush}"></Setter>
         <Setter Property="BorderThickness" Value="0"></Setter>
 
@@ -90,6 +83,95 @@
                                                         <Setter.Value>
                                                             <DataTemplate>
                                                                 <Border Background="{StaticResource CompletionToolTipBackgroundBrush}" CornerRadius="3" BorderThickness="0.5" BorderBrush="#434343" Padding="10 5" TextElement.Foreground="{StaticResource ScriptForegroundBrush}" TextElement.FontSize="12">
+                                                                    <!--<ContentControl Content="{Binding}">
+                                                                        <ContentControl.Style>
+                                                                            <Style TargetType="ContentControl">
+                                                                                <Setter Property="ContentTemplate">
+                                                                                    <Setter.Value>
+                                                                                        <DataTemplate>
+                                                                                            <ContentPresenter Content="{Binding PopupControl}" />
+                                                                                        </DataTemplate>
+                                                                                    </Setter.Value>
+                                                                                </Setter>
+                                                                                <Style.Triggers>
+                                                                                    <DataTrigger Binding="{Binding Type}" Value="method">
+                                                                                        <Setter Property="ContentTemplate">
+                                                                                            <Setter.Value>
+                                                                                                <DataTemplate>
+                                                                                                    <StackPanel>
+                                                                                                        <StackPanel Orientation="Horizontal">
+                                                                                                            <TextBlock Text="{Binding ReturnType}" Foreground="{StaticResource ScriptReferenceTypesBrush}"></TextBlock>
+                                                                                                            <TextBlock Margin="5 0 0 0" Text="{Binding Class}" Foreground="{StaticResource ScriptReferenceTypesBrush}"></TextBlock>
+                                                                                                            <TextBlock>.</TextBlock>
+                                                                                                            <TextBlock Text="{Binding Text}"></TextBlock>
+                                                                                                            <TextBlock>(</TextBlock>
+                                                                                                            <ItemsControl ItemsSource="{Binding Parameters}">
+                                                                                                                <ItemsControl.ItemsPanel>
+                                                                                                                    <ItemsPanelTemplate>
+                                                                                                                        <StackPanel Orientation="Horizontal"></StackPanel>
+                                                                                                                    </ItemsPanelTemplate>
+                                                                                                                </ItemsControl.ItemsPanel>
+                                                                                                                <ItemsControl.ItemTemplate>
+                                                                                                                    <DataTemplate>
+                                                                                                                        <StackPanel Orientation="Horizontal">
+                                                                                                                            <TextBlock Text="{Binding Type.Name}" Foreground="{StaticResource ScriptReferenceTypesBrush}"></TextBlock>
+                                                                                                                            <TextBlock Margin="5 0 0 0" Text="{Binding Name}"></TextBlock>
+                                                                                                                            <TextBlock Margin="0 0 5 0" Text="," Visibility="{Binding IsLast,Converter={StaticResource BooleanToVisibilityInversedConverter}}"></TextBlock>
+                                                                                                                        </StackPanel>
+                                                                                                                    </DataTemplate>
+                                                                                                                </ItemsControl.ItemTemplate>
+                                                                                                            </ItemsControl>
+                                                                                                            <TextBlock>)</TextBlock>
+
+                                                                                                            <StackPanel Margin="5 0 0 0" Orientation="Horizontal" Visibility="{Binding HasOverloads,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                                                                                <TextBlock>(+</TextBlock>
+                                                                                                                <TextBlock Margin="2 0" Text="{Binding Overloads}"></TextBlock>
+                                                                                                                <TextBlock>overloads)</TextBlock>
+                                                                                                            </StackPanel>
+                                                                                                        </StackPanel>
+
+                                                                                                        <TextBlock Text="{Binding Description}"></TextBlock>
+                                                                                                    </StackPanel>
+                                                                                                </DataTemplate>
+                                                                                            </Setter.Value>
+                                                                                        </Setter>
+                                                                                    </DataTrigger>
+
+                                                                                    <DataTrigger Binding="{Binding Type}" Value="property">
+                                                                                        <Setter Property="ContentTemplate">
+                                                                                            <Setter.Value>
+                                                                                                <DataTemplate>
+                                                                                                    <StackPanel>
+                                                                                                        <StackPanel Orientation="Horizontal">
+                                                                                                            <TextBlock Text="{Binding ReturnType}" Foreground="{StaticResource ScriptReferenceTypesBrush}"></TextBlock>
+                                                                                                            <TextBlock Margin="5 0 0 0" Text="{Binding Class}" Foreground="{StaticResource ScriptReferenceTypesBrush}"></TextBlock>
+                                                                                                            <TextBlock>.</TextBlock>
+                                                                                                            <TextBlock Text="{Binding Text}"></TextBlock>
+                                                                                                            <TextBlock Margin="5 0 0 0">
+                                                                                                                <Run>{</Run>
+                                                                                                                <Run Foreground="{StaticResource ScriptKeywordBrush}">get</Run><Run>;</Run>
+                                                                                                                <Run Foreground="{StaticResource ScriptKeywordBrush}">set</Run><Run>;</Run>
+                                                                                                                <Run>}</Run>
+                                                                                                            </TextBlock>
+                                                                                                        </StackPanel>
+
+                                                                                                        <TextBlock Text="{Binding Description}"></TextBlock>
+                                                                                                    </StackPanel>
+                                                                                                </DataTemplate>
+                                                                                            </Setter.Value>
+                                                                                        </Setter>
+                                                                                    </DataTrigger>
+                                                                                </Style.Triggers>
+                                                                            </Style>
+                                                                        </ContentControl.Style>
+
+                                                                        <ContentControl.ContentTemplate>
+                                                                            <DataTemplate>
+                                                                                <ContentPresenter Content="{Binding PopupControl}" />
+                                                                            </DataTemplate>
+                                                                        </ContentControl.ContentTemplate>
+                                                                    </ContentControl>-->
+
                                                                     <ContentPresenter DataContext="{Binding}" Content="{Binding PopupControl}" />
                                                                 </Border>
                                                             </DataTemplate>
@@ -141,15 +223,6 @@
         <Setter Property="Control.Cursor" Value="/Tango.Scripting.Editors;component/themes/RightArrow.cur"/>
     </Style>
 
-    <Style TargetType="{x:Type local:XamlEditor}">
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"></Setter>
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"></Setter>
-        <Setter Property="FontFamily" Value="Consolas"></Setter>
-        <Setter Property="FontSize" Value="13"></Setter>
-        <Setter Property="SyntaxHighlighting" Value="XML"></Setter>
-        <Setter Property="ShowLineNumbers" Value="True"></Setter>        
-    </Style>
-    
     <Style TargetType="{x:Type local:ScriptEditor}">
         <Setter Property="Background" Value="{StaticResource ScriptBackgroundBrush}"></Setter>
         <Setter Property="Foreground" Value="{StaticResource ScriptForegroundBrush}"></Setter>
@@ -494,6 +567,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
-    
 </ResourceDictionary>
-- 
cgit v1.3.1