Menu ▾ ▴

Diff of /trunk/src/DiffViewer.cpp [r883] .. [r884]  Maximize  Restore

Switch to side-by-side view 

--- a/trunk/src/DiffViewer.cpp
+++ b/trunk/src/DiffViewer.cpp
@@ -323,11 +323,15 @@
                 - GetDeviceCaps(hdc, VERTRES)                       // printable height
                 - rectPhysMargins.top;                              // right unprintable margin
 
+            TCHAR localeInfo[3];
+            GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IMEASURE, localeInfo, 3);
+            // Metric system. '1' is US System
+            int defaultMargin = localeInfo[0] == '0' ? 2540 : 1000;
             RECT pagesetupMargin;
-            CRegStdDWORD m_regMargLeft   = CRegStdDWORD(L"Software\\TortoiseSVN\\UDiffpagesetupmarginleft", 2540);
-            CRegStdDWORD m_regMargTop    = CRegStdDWORD(L"Software\\TortoiseSVN\\UDiffpagesetupmargintop", 2540);
-            CRegStdDWORD m_regMargRight  = CRegStdDWORD(L"Software\\TortoiseSVN\\UDiffpagesetupmarginright", 2540);
-            CRegStdDWORD m_regMargBottom = CRegStdDWORD(L"Software\\TortoiseSVN\\UDiffpagesetupmarginbottom", 2540);
+            CRegStdDWORD m_regMargLeft   = CRegStdDWORD(L"Software\\TortoiseSVN\\UDiffpagesetupmarginleft", defaultMargin);
+            CRegStdDWORD m_regMargTop    = CRegStdDWORD(L"Software\\TortoiseSVN\\UDiffpagesetupmargintop", defaultMargin);
+            CRegStdDWORD m_regMargRight  = CRegStdDWORD(L"Software\\TortoiseSVN\\UDiffpagesetupmarginright", defaultMargin);
+            CRegStdDWORD m_regMargBottom = CRegStdDWORD(L"Software\\TortoiseSVN\\UDiffpagesetupmarginbottom", defaultMargin);
 
             pagesetupMargin.left   = (long)(DWORD)m_regMargLeft;
             pagesetupMargin.top    = (long)(DWORD)m_regMargTop;
@@ -343,9 +347,6 @@
                 // thousandths of inches (HiEnglish) margin values
                 // from the Page Setup dialog to device units.
                 // (There are 2540 hundredths of a mm in an inch.)
-
-                TCHAR localeInfo[3];
-                GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IMEASURE, localeInfo, 3);
 
                 if (localeInfo[0] == '0')
                 {