Issues 1, 8

Author: WelterDevelopment

ConTeXt-IDE.Shared/App.xaml

@@ -474,11 +474,6 @@
             <local:FileTypeToVisibility x:Key="FileTypeToVisibility" />
             <local:VisibilityToCornerRadius x:Key="VisibilityToCornerRadius" />
 
-            <Style TargetType="AppBarButton">
-                <Setter Property="CornerRadius" Value="{StaticResource CornerRadius}"/>
-                <Setter Property="LabelPosition" Value="Default"/>
-            </Style>
-
             <ResourceDictionary.ThemeDictionaries>
 
                 <ResourceDictionary x:Key="Default">
@@ -496,13 +491,11 @@
                     <Color x:Key="GripperColor">#555555</Color>
                     <Color x:Key="ForegroundLightColor">#DDEEEEEE</Color>
                     <Color x:Key="AcrylicColor">#444444</Color>
-                    <!--<Color x:Key="SystemAltHighColor">Red</Color>-->
                     <SolidColorBrush x:Key="AccentColorBrushHigh" Color="{ThemeResource SystemAccentColorLight2}"></SolidColorBrush>
                     <SolidColorBrush x:Key="AccentColorBrushLow" Color="{ThemeResource SystemAccentColorDark2}"></SolidColorBrush>
                     <SolidColorBrush x:Key="SystemControlBackgroundAltHighHighBrush" Color="{Binding AccentColorLowLowLow, Source={StaticResource AccentColorSetting}}"></SolidColorBrush>
                     <SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush" Color="{Binding AccentColorLowLow, Source={StaticResource AccentColorSetting}}"></SolidColorBrush>
                     <StaticResource x:Key="SystemBaseHighColor" ResourceKey="ForegroundColor"></StaticResource>
-                    <!--<StaticResource x:Key="SystemAccentColor" ResourceKey="SystemAccentColorDark2"></StaticResource>-->
                 </ResourceDictionary>
 
                 <ResourceDictionary x:Key="HighContrast">
@@ -529,8 +522,6 @@
                     <SolidColorBrush x:Key="AccentColorBrushHigh" Color="{ThemeResource SystemAccentColorDark2}"></SolidColorBrush>
                     <SolidColorBrush x:Key="AccentColorBrushLow" Color="{ThemeResource SystemAccentColorLight2}"></SolidColorBrush>
                     <StaticResource x:Key="SystemBaseHighColor" ResourceKey="ForegroundColor"></StaticResource>
-
-                    <!--<StaticResource x:Key="SystemAccentColor" ResourceKey="SystemAccentColorLight2"></StaticResource>-->
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
         </ResourceDictionary>

ConTeXt-IDE.Shared/Views/MainPage.xaml

@@ -281,9 +281,7 @@
                             </ToggleButton>
 
                             <TextBlock  Style="{StaticResource RibbonTextBlock}" Text="Font Size: "></TextBlock>
-                            <NumberBox Value="{Binding Default.FontSize, Mode=TwoWay}" Minimum="6" Maximum="100" SmallChange="1" LargeChange="4" SpinButtonPlacementMode="Inline" CornerRadius="0,2,2,0">
-                                
-                            </NumberBox>
+                            <NumberBox Value="{Binding Default.FontSize, Mode=TwoWay}" Minimum="6" Maximum="100" SmallChange="1" LargeChange="4" Height="100" SpinButtonPlacementMode="Inline" CornerRadius="0,2,2,0">  </NumberBox>
 
                             <Border Style="{StaticResource Separator}" ></Border>
 

ConTeXt-IDE.Shared/Views/MainPage.xaml.cs

@@ -23,6 +23,7 @@
 using System.Net.NetworkInformation;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices.WindowsRuntime;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
@@ -559,8 +560,8 @@ private async void FileDrop(DragEventArgs e)
 
         private async void FileItemTapped(object sender, TappedRoutedEventArgs e)
         {
-            var treeviewitem = (sender as MyTreeViewItem);
-            var fileitem = treeviewitem.DataContext as FileItem;
+            MyTreeViewItem treeviewitem = sender as MyTreeViewItem;
+            FileItem fileitem = treeviewitem.DataContext as FileItem;
 
             if (fileitem.Type == FileItem.ExplorerItemType.File)
             {
@@ -577,6 +578,7 @@ private async void FileItemTapped(object sender, TappedRoutedEventArgs e)
                     tip.HeroContent = content;
                     tip.HeroContentPlacement = TeachingTipHeroContentPlacementMode.Bottom;
                     RootGrid.Children.Add(tip);
+                
                     tip.IsOpen = true;
                 }
                 else if (type == ".pdf")
@@ -691,8 +693,15 @@ public async void CompileTex(bool compileRoot = false, FileItem fileToCompile =
                             App.VM.IsError = true;
                             StorageFile errorfile = error as StorageFile;
                             string text = await FileIO.ReadTextAsync(errorfile);
-                            string newtext = text.Replace("  ", "").Replace("return", "").Replace("[\"", "\"").Replace("\"]", "\"").Replace(@"\n", "").Replace("=", ":");
+
+                            // BAD code, quick hack to convert the lua table to a json format. Depending on special characters in the error message, the JsonConvert.DeserializeObject function can through errors.
+                            string newtext = text.Replace("  ", "").Replace("return", "").Replace("[\"", "\"").Replace("\"]", "\"").Replace("=", ":");
+                            string pattern = @"([^\\])(\\n)"; // Matches every \n except \\n
+                            string replacement = "$1"; // Match gets replaced with first capturing group, e.g. ]\n --> ]
+                            newtext = Regex.Replace(newtext, pattern, replacement);
+
                             var errormessage = JsonConvert.DeserializeObject<ConTeXtErrorMessage>(newtext);
+
                             App.VM.Log("Compiler error: " + errormessage.lasttexerror);
                             App.VM.ConTeXtErrorMessage = errormessage;
                         }
@@ -884,13 +893,22 @@ private async void Tabs_TabCloseRequested(TabView sender, TabViewTabCloseRequest
             VM.CurrentProject.LastOpenedFiles = VM.FileItems.Select(x => x.FileName).ToList();
         }
 
-        private void Pin_Click(object sender, RoutedEventArgs e)
+        private async void Pin_Click(object sender, RoutedEventArgs e)
         {
             var fi = (FileItem)(sender as FrameworkElement).DataContext;
+
+            if (!fi.IsPinned) {
+                bool reselect = fi == VM.CurrentFileItem;
+                VM.FileItems.Remove(fi);
+                VM.FileItems.Insert(0, fi);
+                if (reselect)
+                {
+                    await Task.Delay(500);
+                    VM.CurrentFileItem = fi;
+                }
+            }
+
             fi.IsPinned = !fi.IsPinned;
-            int currind = VM.FileItems.IndexOf(fi);
-            if (currind > 0)
-                VM.FileItems.Move(currind, 0);
         }
 
         #endregion