colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-10 10:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: dpi drawing didn't work when changing the frame of a view

Browse Source
This commit is contained in:
Alexandre Wilhelm committed 2014-09-17 13:35:07 -07:00
1 parent 451ac297d4
commit 79ef6f2f75
1 file changed
+13 -5
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPView.j
+13 -5
View File
@@ -206,6 +206,9 @@ var CPViewHighDPIDrawingEnabled = YES;
CGSize _hierarchyScaleSize;
CGSize _scaleSize;
// Drawing high DPI
float _highDPIRatio;
// Layout Support
BOOL _needsLayout;
JSObject _ephemeralSubviews;
@@ -1031,7 +1034,7 @@ var CPViewHighDPIDrawingEnabled = YES;
if (_DOMContentsElement)
{
CPDOMDisplayServerSetSize(_DOMContentsElement, size.width, size.height);
CPDOMDisplayServerSetSize(_DOMContentsElement, size.width * _highDPIRatio, size.height * _highDPIRatio);
CPDOMDisplayServerSetStyleSize(_DOMContentsElement, size.width, size.height);
}
@@ -2478,8 +2481,9 @@ setBoundsOrigin:
var width = CGRectGetWidth(_frame),
height = CGRectGetHeight(_frame),
devicePixelRatio = window.devicePixelRatio || 1,
backingStoreRatio = CPBrowserBackingStorePixelRatio(graphicsPort),
ratio = CPViewHighDPIDrawingEnabled ? (devicePixelRatio / backingStoreRatio) : 1;
backingStoreRatio = CPBrowserBackingStorePixelRatio(graphicsPort);
_highDPIRatio = CPViewHighDPIDrawingEnabled ? (devicePixelRatio / backingStoreRatio) : 1;
_DOMContentsElement = graphicsPort.DOMElement;
@@ -2489,7 +2493,7 @@ setBoundsOrigin:
_DOMContentsElement.style.position = "absolute";
_DOMContentsElement.style.visibility = "visible";
CPDOMDisplayServerSetSize(_DOMContentsElement, width * ratio, height * ratio);
CPDOMDisplayServerSetSize(_DOMContentsElement, width * _highDPIRatio, height * _highDPIRatio);
CPDOMDisplayServerSetStyleLeftTop(_DOMContentsElement, NULL, 0.0, 0.0);
CPDOMDisplayServerSetStyleSize(_DOMContentsElement, width, height);
@@ -2499,12 +2503,16 @@ setBoundsOrigin:
if (CPPlatformHasBug(CPCanvasParentDrawErrorsOnMovementBug))
_DOMElement.style.webkitTransform = 'translateX(0)';
CGContextScaleCTM(graphicsPort, ratio, ratio);
// FIXME: should be here
//graphicsPort.setTransform(_highDPIRatio, 0, 0 , _highDPIRatio, 0, 0);
CPDOMDisplayServerAppendChild(_DOMElement, _DOMContentsElement);
#endif
_graphicsContext = [CPGraphicsContext graphicsContextWithGraphicsPort:graphicsPort flipped:YES];
}
// FIXME : should not be here...something wrong somewhere, the context should keep the informations of the above setTransform
[_graphicsContext graphicsPort].setTransform(_highDPIRatio, 0, 0 , _highDPIRatio, 0, 0);
[CPGraphicsContext setCurrentContext:_graphicsContext];
CGContextSaveGState([_graphicsContext graphicsPort]);