summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/debugger/osx/debugview.mm
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2016-08-01 01:37:39 +1000
committer Vas Crabb <vas@vastheman.com>2016-08-01 01:37:39 +1000
commit0ceae26bb4c631ff2538f3fcca7f15ccf0454843 (patch)
tree2af7757080d26ed6f70c4e5e3f116b2142eb8352 /src/osd/modules/debugger/osx/debugview.mm
parenta0ce6c3b37050c1a765ae13babb109c729153989 (diff)
patch up on OSX
Diffstat (limited to 'src/osd/modules/debugger/osx/debugview.mm')
-rw-r--r--src/osd/modules/debugger/osx/debugview.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/modules/debugger/osx/debugview.mm b/src/osd/modules/debugger/osx/debugview.mm
index f4a7c8cd2cb..f9bf650a7ac 100644
--- a/src/osd/modules/debugger/osx/debugview.mm
+++ b/src/osd/modules/debugger/osx/debugview.mm
@@ -583,7 +583,7 @@ static void debugwin_view_update(debug_view &view, void *osdprivate)
if (wholeLineScroll)
{
CGFloat const clamp = [self bounds].size.height - fontHeight - proposedVisibleRect.size.height;
- proposedVisibleRect.origin.y = std::min((int)proposedVisibleRect.origin.y, std::max((int)clamp, 0));
+ proposedVisibleRect.origin.y = std::min(proposedVisibleRect.origin.y, std::max(clamp, CGFloat(0)));
proposedVisibleRect.origin.y -= fmod(proposedVisibleRect.origin.y, fontHeight);
}
return proposedVisibleRect;
@@ -668,7 +668,7 @@ static void debugwin_view_update(debug_view &view, void *osdprivate)
inTextContainer:textContainer];
if (start == 0)
box.origin.x = 0;
- box.size.width = std::max((int)([self bounds].size.width - box.origin.x), 0);
+ box.size.width = std::max([self bounds].size.width - box.origin.x, CGFloat(0));
[[self backgroundForAttribute:attr] set];
[NSBezierPath fillRect:NSMakeRect(box.origin.x,
row * fontHeight,