diff options
| author | Akash Jain <akash96j@gmail.com> | 2016-07-06 10:35:24 +0530 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-10-18 20:41:29 +0200 |
| commit | 828b8cf4d26c4d72c1f2146fd7a5bbb3b0465718 (patch) | |
| tree | a6e78805971961c885d90164471da5ff1a9695e3 | |
| parent | 07492d483bf4bbcc288bcca0e874142b2d9b9ae2 (diff) | |
GSoC: Integrate new CommonSalLayout in unx/ code
Change-Id: I991cb5cbd2adad4f4c9f62f807990b9fde2a5133
| -rw-r--r-- | vcl/README.vars | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/vcl/README.vars b/vcl/README.vars index e97d85dcf8ba..10e6356951d1 100644 --- a/vcl/README.vars +++ b/vcl/README.vars @@ -6,6 +6,7 @@ SAL_USE_VCLPLUGIN - use a VCL plugin SAL_NO_NWF - disable native widgets SAL_FORCEDPI - force a specific DPI (gtk & gtk3 plugins only) SAL_FORCE_HC - force high-contrast mode +SAL_USE_COMMON_LAYOUT - use CommonSalLayout layout engine for text layout VCL_DOUBLEBUFFERING_AVOID_PAINT - don't paint the buffer, useful to see where we do direct painting VCL_DOUBLEBUFFERING_FORCE_ENABLE - enable double buffered painting diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 372cd4d135ae..01f82db0019d 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -42,6 +42,7 @@ #include <cairo.h> #include <cairo-ft.h> +#include "CommonSalLayout.hxx" namespace { @@ -540,7 +541,10 @@ SalLayout* CairoTextRender::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackL } else #endif - pLayout = new ServerFontLayout( *mpServerFont[ nFallbackLevel ] ); + if (getenv("SAL_USE_COMMON_LAYOUT")) + pLayout = new CommonSalLayout(*mpServerFont[nFallbackLevel]); + else + pLayout = new ServerFontLayout(*mpServerFont[nFallbackLevel]); } return pLayout; |