Ensure C# UI uses consistent culture on all threads. Closes #72

* This means that e.g. decimal separator will always be . and similar effects, which avoids the need to have culture specific formatting or special-case handling around CSV export etc.
baldurk · Jul 23, 2014 · 74a0330 · 74a0330
1 parent e94726c
commit 74a0330
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 12 deletions.
diff --git a/renderdocui/Code/AppMain.cs b/renderdocui/Code/AppMain.cs
@@ -105,6 +105,8 @@ static void Main(string[] args)
             // propogate float formatting settings to the Formatter class used globally to format float values
             cfg.SetupFormatter();
 
+            Application.CurrentCulture = new System.Globalization.CultureInfo("en-GB");
+
             var core = new Core(filename, temp, cfg);
 
             try

diff --git a/renderdocui/Code/Core.cs b/renderdocui/Code/Core.cs
@@ -383,7 +383,7 @@ public void LoadLogfile(int proxyRenderer, string replayHost, string logFile, bo
             // We'll close it down when log loading finishes (whether it succeeds or fails)
             ModalPopup modal = new ModalPopup(LogLoadCallback, true);
 
-            Thread modalThread = new Thread(new ThreadStart(() =>
+            Thread modalThread = Helpers.NewThread(new ThreadStart(() =>
             {
                 modal.SetModalText(string.Format("Loading Log {0}.", m_LogFile));
 
@@ -396,7 +396,7 @@ public void LoadLogfile(int proxyRenderer, string replayHost, string logFile, bo
 
             // this thread continually ticks and notifies any threads of the progress, through a float
             // that is updated by the main loading code
-            Thread thread = new Thread(new ThreadStart(() =>
+            Thread thread = Helpers.NewThread(new ThreadStart(() =>
             {
                 modal.LogfileProgressBegin();
 

diff --git a/renderdocui/Code/Helpers.cs b/renderdocui/Code/Helpers.cs
@@ -28,6 +28,7 @@
 using System.Linq;
 using System.Text;
 using System.IO;
+using System.Threading;
 using System.Windows.Forms;
 using WeifenLuo.WinFormsUI.Docking;
 using Microsoft.Win32;
@@ -82,6 +83,20 @@ public static bool IsElevated
             }
         }
 
+        public static Thread NewThread(ParameterizedThreadStart s)
+        {
+            Thread ret = new Thread(s);
+            ret.CurrentCulture = Application.CurrentCulture;
+            return ret;
+        }
+
+        public static Thread NewThread(ThreadStart s)
+        {
+            Thread ret = new Thread(s);
+            ret.CurrentCulture = Application.CurrentCulture;
+            return ret;
+        }
+
         public static void RefreshAssociations()
         {
             Win32PInvoke.SHChangeNotify(Win32PInvoke.HChangeNotifyEventID.SHCNE_ASSOCCHANGED,

diff --git a/renderdocui/Code/RenderManager.cs b/renderdocui/Code/RenderManager.cs
@@ -89,7 +89,7 @@ public void Init(int proxyRenderer, string replayHost, string logfile)
 
             InitException = null;
 
-            m_Thread = new Thread(new ThreadStart(this.RunThread));
+            m_Thread = Helpers.NewThread(new ThreadStart(this.RunThread));
             m_Thread.Priority = ThreadPriority.Highest;
             m_Thread.Start();
 

diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
@@ -1351,7 +1351,7 @@ private void UI_FillRawData(UIState state)
             Input input = state.m_Input;
             uint instance = m_CurInst;
 
-            Thread th = new Thread(new ThreadStart(() =>
+            Thread th = Helpers.NewThread(new ThreadStart(() =>
             {
                 byte[][] d = data.Buffers;
 

diff --git a/renderdocui/Windows/Dialogs/LiveCapture.cs b/renderdocui/Windows/Dialogs/LiveCapture.cs
@@ -115,7 +115,7 @@ public void QueueCapture(int frameNum)
 
         private void LiveCapture_Shown(object sender, EventArgs e)
         {
-            m_ConnectThread = new Thread(new ThreadStart(ConnectionThreadEntry));
+            m_ConnectThread = Helpers.NewThread(new ThreadStart(ConnectionThreadEntry));
             m_ConnectThread.Start();
         }
 

diff --git a/renderdocui/Windows/Dialogs/RemoteHostSelect.cs b/renderdocui/Windows/Dialogs/RemoteHostSelect.cs
@@ -87,7 +87,7 @@ private void AddHost(String host)
 
             refresh.Enabled = false;
 
-            Thread th = new Thread(new ParameterizedThreadStart(LookupHostConnections));
+            Thread th = Helpers.NewThread(new ParameterizedThreadStart(LookupHostConnections));
             th.Start(node);
         }
 
@@ -263,7 +263,7 @@ private void refresh_Click(object sender, EventArgs e)
                 n.Image = global::renderdocui.Properties.Resources.hourglass;
                 n.Bold = false;
 
-                Thread th = new Thread(new ParameterizedThreadStart(LookupHostConnections));
+                Thread th = Helpers.NewThread(new ParameterizedThreadStart(LookupHostConnections));
                 th.Start(n);
             }
             hosts.EndUpdate();

diff --git a/renderdocui/Windows/MainWindow.cs b/renderdocui/Windows/MainWindow.cs
@@ -561,7 +561,7 @@ private void LoadLogAsync(string filename, bool temporary)
                         }
                     }
 
-                    thread = new Thread(new ThreadStart(() =>
+                    thread = Helpers.NewThread(new ThreadStart(() =>
                     {
                         string[] drivers = new string[0];
                         try
@@ -644,7 +644,7 @@ private void LoadLogAsync(string filename, bool temporary)
             }
             else
             {
-                thread = new Thread(new ThreadStart(() => m_Core.LoadLogfile(filename, temporary)));
+                thread = Helpers.NewThread(new ThreadStart(() => m_Core.LoadLogfile(filename, temporary)));
             }
 
             thread.Start();
@@ -879,7 +879,7 @@ private void CheckUpdates()
 
             m_Core.Config.CheckUpdate_LastUpdate = today;
 
-            var updateThread = new Thread(new ThreadStart(() =>
+            var updateThread = Helpers.NewThread(new ThreadStart(() =>
             {
                 // spawn thread to check update
                 WebRequest g = HttpWebRequest.Create(String.Format("http://renderdoc.org/checkupdate/{0}", VersionString));
@@ -1263,7 +1263,7 @@ private void launchReplayHostToolStripMenuItem_Click(object sender, EventArgs e)
         {
             bool killReplay = false;
 
-            Thread thread = new Thread(new ThreadStart(() =>
+            Thread thread = Helpers.NewThread(new ThreadStart(() =>
             {
                 StaticExports.SpawnReplayHost(ref killReplay);
             }));

diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs
@@ -2302,7 +2302,7 @@ void rangeHistogram_RangeUpdated(object sender, Controls.RangeHistogramEventArgs
                 return;
             }
 
-            rangePaintThread = new Thread(new ThreadStart(() =>
+            rangePaintThread = Helpers.NewThread(new ThreadStart(() =>
             {
                 m_Core.Renderer.Invoke((ReplayRenderer r) => { RT_UpdateAndDisplay(r); if (m_Output != null) m_Output.Display(); });
                 Thread.Sleep(8);