8.9

1 files changed, 95 insertions, 95 deletions

diff --git a/wx+/rtl.h b/wx+/rtl.h
index 206e8e6f..f516ca29 100644..100755
--- a/wx+/rtl.h
+++ b/wx+/rtl.h
@@ -1,95 +1,95 @@
-// *****************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under    *
-// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0           *
-// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
-// *****************************************************************************
-
-#ifndef RTL_H_0183487180058718273432148
-#define RTL_H_0183487180058718273432148
-
-#include <zen/optional.h>
-#include <wx/dcmemory.h>
-#include <wx/image.h>
-#include <wx/app.h>
-
-namespace zen
-{
-//functions supporting right-to-left GUI layout
-void drawBitmapRtlMirror  (wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment, Opt<wxBitmap>& buffer);
-void drawBitmapRtlNoMirror(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment);
-//wxDC::DrawIcon DOES mirror by default -> implement RTL support when needed
-
-wxBitmap mirrorIfRtl(const wxBitmap& bmp);
-
-//manual text flow correction: http://www.w3.org/International/articles/inline-bidi-markup/
-
-
-
-
-
-
-
-
-//---------------------- implementation ------------------------
-namespace impl
-{
-//don't use wxDC::DrawLabel: it results in expensive GetTextExtent() call even when passing an empty string!!!
-//also avoid wxDC::DrawLabel 1-off alignment bugs
-inline
-void drawBitmapAligned(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment)
-{
-    wxPoint pt = rect.GetTopLeft();
-    if (alignment & wxALIGN_RIGHT) //note: wxALIGN_LEFT == 0!
-        pt.x += rect.width - image.GetWidth();
-    else if (alignment & wxALIGN_CENTER_HORIZONTAL)
-        pt.x += (rect.width - image.GetWidth()) / 2;
-
-    if (alignment & wxALIGN_BOTTOM) //note: wxALIGN_TOP == 0!
-        pt.y += rect.height - image.GetHeight();
-    else if (alignment & wxALIGN_CENTER_VERTICAL)
-        pt.y += (rect.height - image.GetHeight()) / 2;
-
-    dc.DrawBitmap(image, pt);
-}
-}
-
-
-inline
-void drawBitmapRtlMirror(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment, Opt<wxBitmap>& buffer)
-{
-    if (dc.GetLayoutDirection() == wxLayout_RightToLeft)
-    {
-        if (!buffer || buffer->GetWidth() != rect.width || buffer->GetHeight() < rect.height) //[!] since we do a mirror, width needs to match exactly!
-            buffer = wxBitmap(rect.width, rect.height);
-
-        wxMemoryDC memDc(*buffer);
-        memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction!
-
-        impl::drawBitmapAligned(memDc, image, wxRect(0, 0, rect.width, rect.height), alignment);
-        //note: we cannot simply use memDc.SetLayoutDirection(wxLayout_RightToLeft) due to some strange 1 pixel bug!
-
-        dc.Blit(rect.GetTopLeft(), rect.GetSize(), &memDc, wxPoint(0, 0)); //blit out: mirror once again
-    }
-    else
-        impl::drawBitmapAligned(dc, image, rect, alignment);
-}
-
-
-inline
-void drawBitmapRtlNoMirror(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment)
-{
-    return impl::drawBitmapAligned(dc, image, rect, alignment); //wxDC::DrawBitmap does NOT mirror by default
-}
-
-
-inline
-wxBitmap mirrorIfRtl(const wxBitmap& bmp)
-{
-    if (wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft)
-        return bmp.ConvertToImage().Mirror();
-    else
-        return bmp;
-}
-}
-
-#endif //RTL_H_0183487180058718273432148
+// *****************************************************************************

+// * This file is part of the FreeFileSync project. It is distributed under    *

+// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0           *

+// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *

+// *****************************************************************************

+

+#ifndef RTL_H_0183487180058718273432148

+#define RTL_H_0183487180058718273432148

+

+#include <zen/optional.h>

+#include <wx/dcmemory.h>

+#include <wx/image.h>

+#include <wx/app.h>

+

+namespace zen

+{

+//functions supporting right-to-left GUI layout

+void drawBitmapRtlMirror  (wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment, Opt<wxBitmap>& buffer);

+void drawBitmapRtlNoMirror(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment);

+//wxDC::DrawIcon DOES mirror by default -> implement RTL support when needed

+

+wxBitmap mirrorIfRtl(const wxBitmap& bmp);

+

+//manual text flow correction: http://www.w3.org/International/articles/inline-bidi-markup/

+

+

+

+

+

+

+

+

+//---------------------- implementation ------------------------

+namespace impl

+{

+//don't use wxDC::DrawLabel: it results in expensive GetTextExtent() call even when passing an empty string!!!

+//also avoid wxDC::DrawLabel 1-off alignment bugs

+inline

+void drawBitmapAligned(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment)

+{

+    wxPoint pt = rect.GetTopLeft();

+    if (alignment & wxALIGN_RIGHT) //note: wxALIGN_LEFT == 0!

+        pt.x += rect.width - image.GetWidth();

+    else if (alignment & wxALIGN_CENTER_HORIZONTAL)

+        pt.x += (rect.width - image.GetWidth()) / 2;

+

+    if (alignment & wxALIGN_BOTTOM) //note: wxALIGN_TOP == 0!

+        pt.y += rect.height - image.GetHeight();

+    else if (alignment & wxALIGN_CENTER_VERTICAL)

+        pt.y += (rect.height - image.GetHeight()) / 2;

+

+    dc.DrawBitmap(image, pt);

+}

+}

+

+

+inline

+void drawBitmapRtlMirror(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment, Opt<wxBitmap>& buffer)

+{

+    if (dc.GetLayoutDirection() == wxLayout_RightToLeft)

+    {

+        if (!buffer || buffer->GetWidth() != rect.width || buffer->GetHeight() < rect.height) //[!] since we do a mirror, width needs to match exactly!

+            buffer = wxBitmap(rect.width, rect.height);

+

+        wxMemoryDC memDc(*buffer);

+        memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction!

+

+        impl::drawBitmapAligned(memDc, image, wxRect(0, 0, rect.width, rect.height), alignment);

+        //note: we cannot simply use memDc.SetLayoutDirection(wxLayout_RightToLeft) due to some strange 1 pixel bug!

+

+        dc.Blit(rect.GetTopLeft(), rect.GetSize(), &memDc, wxPoint(0, 0)); //blit out: mirror once again

+    }

+    else

+        impl::drawBitmapAligned(dc, image, rect, alignment);

+}

+

+

+inline

+void drawBitmapRtlNoMirror(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment)

+{

+    return impl::drawBitmapAligned(dc, image, rect, alignment); //wxDC::DrawBitmap does NOT mirror by default

+}

+

+

+inline

+wxBitmap mirrorIfRtl(const wxBitmap& bmp)

+{

+    if (wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft)

+        return bmp.ConvertToImage().Mirror();

+    else

+        return bmp;

+}

+}

+

+#endif //RTL_H_0183487180058718273432148