]> O.S.I.I.S - jp/crow.git/commitdiff
Merge branch 'StylingImprovments'
authorjpbruyere <jp.bruyere@hotmail.com>
Sun, 31 Jul 2016 10:29:20 +0000 (12:29 +0200)
committerjpbruyere <jp.bruyere@hotmail.com>
Sun, 31 Jul 2016 10:29:20 +0000 (12:29 +0200)
1  2 
Crow.csproj
src/GraphicObjects/GraphicObject.cs
src/GraphicObjects/Label.cs
src/GraphicObjects/TextRun.cs
src/Interface.cs

diff --cc Crow.csproj
Simple merge
Simple merge
Simple merge
index 6af22025b8181d45f5234b26333ee2f057670944,cc882f4071644c2f0448ef1d8c24fad5b13923a1..35b46f18da79d662877f9cfa04136a265ba31d66
@@@ -279,16 -279,21 +277,16 @@@ namespace Cro
                                                continue;
                                        }
  
-                                       Foreground.SetAsSource (gr);    
+                                       Foreground.SetAsSource (gr);
                                        gr.MoveTo (rText.X, rText.Y + fe.Ascent + fe.Height * curLineCount);
  
 -#if _WIN32 || _WIN64
 -                                      gr.ShowText(ll.ToUtf8());
 -#elif __linux__
                                        gr.ShowText (ll);
 -#endif
                                        gr.Fill ();
  
                                        curLineCount++;
 -
                                }
-                       }                                               
+                       }
                }
                #endregion
-     }
+       }
  }
Simple merge