Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI Image fixes #636

Merged
merged 9 commits into from
Jul 25, 2016
Merged

UI Image fixes #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ffab5cd
Changes to resolve graphic corruption bug and optimize drawing of ima…
Jul 11, 2016
be5942a
Moved a comment inside an if statement.
Jul 11, 2016
e110851
Replace asserts with UNSUPPORTED_MSG macros.
Jul 12, 2016
799c50c
Minor change.
Jul 12, 2016
e4004cc
Merge branch 'develop' of https://github.com/Microsoft/WinObjC into C…
Jul 13, 2016
390f511
Merge remote-tracking branch 'upstream/develop' into CoreGraphicsFixes
Jul 14, 2016
b6bf84c
Implement opacity and blendMode settings in drawRect(pos), drawRect(p…
Jul 21, 2016
532b33e
Update copyright headers and remove kCGBlendModeInvalid enum
Jul 21, 2016
51f4f4f
Removed makeRect and substituted previous references to it with CGMak…
Jul 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Frameworks/CoreGraphics/CGContext.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//******************************************************************************
//
// 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).
Expand Down Expand Up @@ -70,10 +71,6 @@ - (void)dealloc {
delete _backing;
}

CGContextImpl* __CGContext::Backing() {
return _backing;
}

/**
@Status Interoperable
*/
Expand Down
9 changes: 5 additions & 4 deletions Frameworks/CoreGraphics/CGContextCairo.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//******************************************************************************
//
// 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).
Expand Down Expand Up @@ -325,7 +326,7 @@
cairo_new_path(_drawContext);
cairo_rectangle(_drawContext, 0, 0, dest.size.width, dest.size.height);
cairo_clip(_drawContext);
cairo_paint(_drawContext);
cairo_paint_with_alpha(_drawContext, curState->curFillColor.a);

cairo_restore(_drawContext);
cairo_new_path(_drawContext);
Expand Down Expand Up @@ -375,7 +376,7 @@
cairo_clip(_drawContext);

if (curState->_imgMask == NULL) {
cairo_paint(_drawContext);
cairo_paint_with_alpha(_drawContext, curState->curFillColor.a);
} else {
cairo_mask_surface(_drawContext, curState->_imgMask->Backing()->LockCairoSurface(), 0.0, 0.0);
curState->_imgMask->Backing()->ReleaseCairoSurface();
Expand Down Expand Up @@ -1420,7 +1421,7 @@
cairo_mask_surface(_drawContext, curState->_imgMask->Backing()->LockCairoSurface(), 0.0, 0.0);
curState->_imgMask->Backing()->ReleaseCairoSurface();
} else {
cairo_paint(_drawContext);
cairo_paint_with_alpha(_drawContext, curState->curFillColor.a);
}
cairo_pattern_destroy(pattern);
UNLOCK_CAIRO();
Expand Down Expand Up @@ -1461,7 +1462,7 @@
cairo_mask_surface(_drawContext, curState->_imgMask->Backing()->LockCairoSurface(), 0.0, 0.0);
curState->_imgMask->Backing()->ReleaseCairoSurface();
} else {
cairo_paint(_drawContext);
cairo_paint_with_alpha(_drawContext, curState->curFillColor.a);
}
cairo_pattern_destroy(pattern);
UNLOCK_CAIRO();
Expand Down
Loading