colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-14 18:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tableview

Browse Source
This commit is contained in:
Francisco Ryan Tolmasky I committed 2009-07-07 11:34:27 -07:00
2 parents ddbc1e0e94 b2f35b61d3
commit 6ad5ec4d66
2 files changed
+4 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPScrollView.j
+1 -3
View File
@@ -655,8 +655,7 @@
*/
- (void)scrollWheel:(CPEvent)anEvent
{
var value = [_verticalScroller floatValue],
documentFrame = [[self documentView] frame],
var documentFrame = [[self documentView] frame],
contentBounds = [_contentView bounds];
contentBounds.origin.x += [anEvent deltaX] * _horizontalLineScroll;
@@ -669,7 +668,6 @@
- (void)keyDown:(CPEvent)anEvent
{
var keyCode = [anEvent keyCode],
value = [_verticalScroller floatValue],
documentFrame = [[self documentView] frame],
contentBounds = [_contentView bounds];
AppKit/Platform/DOM/CPDOMWindowBridge.j
+3 -3
View File
@@ -785,7 +785,7 @@ var CTRL_KEY_CODE = 17;
location.x -= CGRectGetMinX(windowFrame);
location.y -= CGRectGetMinY(windowFrame);
if(typeof aDOMEvent.wheelDeltaX != "undefined")
{
deltaX = aDOMEvent.wheelDeltaX / 120.0;
@@ -811,8 +811,8 @@ var CTRL_KEY_CODE = 17;
timestamp:timestamp windowNumber:windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0 ];
event._DOMEvent = aDOMEvent;
event._deltaX = ROUND(deltaX * 1.5);
event._deltaY = ROUND(deltaY * 1.5);
event._deltaX = deltaX;
event._deltaY = deltaY;
[CPApp sendEvent:event];