Per shiproom discussion, reverting "UI Image fixes (#636)" until we h…

…ave the fixes for High-DPI issues ready to merge. This reverts commit a106d3d.
microsoft · Aug 2, 2016 · f34a09a · f34a09a
1 parent d6c3e1f
commit f34a09a
Show file tree

Hide file tree

Showing 5 changed files with 354 additions and 140 deletions.
diff --git a/Frameworks/CoreGraphics/CGContext.mm b/Frameworks/CoreGraphics/CGContext.mm
@@ -1,6 +1,5 @@
 //******************************************************************************
 //
-// Copyright (c) 2016 Intel Corporation. All rights reserved.
 // Copyright (c) 2016 Microsoft Corporation. All rights reserved.
 //
 // This code is licensed under the MIT License (MIT).
@@ -72,6 +71,10 @@ - (void)dealloc {
     delete _backing;
 }
 
+CGContextImpl* __CGContext::Backing() {
+    return _backing;
+}
+
 /**
  @Status Interoperable
 */

diff --git a/Frameworks/CoreGraphics/CGContextCairo.mm b/Frameworks/CoreGraphics/CGContextCairo.mm
@@ -1,6 +1,5 @@
 //******************************************************************************
 //
-// Copyright (c) 2016 Intel Corporation. All rights reserved.
 // Copyright (c) 2016 Microsoft Corporation. All rights reserved.
 //
 // This code is licensed under the MIT License (MIT).
@@ -326,7 +325,7 @@
         cairo_new_path(_drawContext);
         cairo_rectangle(_drawContext, 0, 0, dest.size.width, dest.size.height);
         cairo_clip(_drawContext);
-        cairo_paint_with_alpha(_drawContext, curState->curFillColor.a);
+        cairo_paint(_drawContext);
 
         cairo_restore(_drawContext);
         cairo_new_path(_drawContext);
@@ -376,7 +375,7 @@
         cairo_clip(_drawContext);
 
         if (curState->_imgMask == NULL) {
-            cairo_paint_with_alpha(_drawContext, curState->curFillColor.a);
+            cairo_paint(_drawContext);
         } else {
             cairo_mask_surface(_drawContext, curState->_imgMask->Backing()->LockCairoSurface(), 0.0, 0.0);
             curState->_imgMask->Backing()->ReleaseCairoSurface();
@@ -1431,7 +1430,7 @@
         cairo_mask_surface(_drawContext, curState->_imgMask->Backing()->LockCairoSurface(), 0.0, 0.0);
         curState->_imgMask->Backing()->ReleaseCairoSurface();
     } else {
-        cairo_paint_with_alpha(_drawContext, curState->curFillColor.a);
+        cairo_paint(_drawContext);
     }
     cairo_pattern_destroy(pattern);
     UNLOCK_CAIRO();
@@ -1472,7 +1471,7 @@
         cairo_mask_surface(_drawContext, curState->_imgMask->Backing()->LockCairoSurface(), 0.0, 0.0);
         curState->_imgMask->Backing()->ReleaseCairoSurface();
     } else {
-        cairo_paint_with_alpha(_drawContext, curState->curFillColor.a);
+        cairo_paint(_drawContext);
     }
     cairo_pattern_destroy(pattern);
     UNLOCK_CAIRO();