summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/event.cxx8
-rw-r--r--vcl/unx/generic/gdi/cairotextrender.cxx21
2 files changed, 13 insertions, 16 deletions
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 6a9ed84cbaab..b344d7104fc6 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -629,11 +629,9 @@ void Window::ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow,
}
if ( bCallActivate && ! pNewOverlapWindow->mpWindowImpl->mbActive )
{
- if( ! pNewOverlapWindow->mpWindowImpl->mbActive )
- {
- pNewOverlapWindow->mpWindowImpl->mbActive = true;
- pNewOverlapWindow->Activate();
- }
+ pNewOverlapWindow->mpWindowImpl->mbActive = true;
+ pNewOverlapWindow->Activate();
+
if ( pNewRealWindow != pNewOverlapWindow )
{
if( ! pNewRealWindow->mpWindowImpl->mbActive )
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 7febf686e9fd..25317651a003 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -275,17 +275,16 @@ void CairoTextRender::DrawTextLayout(const CommonSalLayout& rLayout)
//like them
double xdiff = 0.0;
double ydiff = 0.0;
- if (nGlyphRotation)
- {
- // The y is the origin point position, but Cairo will draw
- // the glyph *above* that point, we need to move it down to
- // the glyph’s baseline.
- cairo_text_extents_t aExt;
- cairo_glyph_extents(cr, &cairo_glyphs[nStartIndex], nLen, &aExt);
- double nDescender = std::fmax(aExt.height + aExt.y_bearing, 0);
- ydiff = (aExt.x_advance - nDescender) / nHeight;
- xdiff = -font_extents.descent/nHeight;
- }
+
+ // The y is the origin point position, but Cairo will draw
+ // the glyph *above* that point, we need to move it down to
+ // the glyph’s baseline.
+ cairo_text_extents_t aExt;
+ cairo_glyph_extents(cr, &cairo_glyphs[nStartIndex], nLen, &aExt);
+ double nDescender = std::fmax(aExt.height + aExt.y_bearing, 0);
+ ydiff = (aExt.x_advance - nDescender) / nHeight;
+ xdiff = -font_extents.descent/nHeight;
+
cairo_matrix_translate(&m, xdiff, ydiff);
}