summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/debugger
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2015-02-19 01:55:24 +1100
committer Vas Crabb <vas@vastheman.com>2015-02-19 01:55:24 +1100
commitc46847b551a099861677f677cf60013e3165ba41 (patch)
treecc8db9feeae521cf7e89c8926469b9f7cadf6fcd /src/osd/modules/debugger
parent5810647ed1b81badb1a0bc5181815f6876bdfa7e (diff)
Better autosizing for windows
Diffstat (limited to 'src/osd/modules/debugger')
-rw-r--r--src/osd/modules/debugger/debugosx.m3
-rw-r--r--src/osd/modules/debugger/osx/debugview.m4
-rw-r--r--src/osd/modules/debugger/osx/disassemblyview.m3
-rw-r--r--src/osd/modules/debugger/osx/memoryview.m3
4 files changed, 7 insertions, 6 deletions
diff --git a/src/osd/modules/debugger/debugosx.m b/src/osd/modules/debugger/debugosx.m
index 491aefbedda..d57d82826bc 100644
--- a/src/osd/modules/debugger/debugosx.m
+++ b/src/osd/modules/debugger/debugosx.m
@@ -12,10 +12,9 @@
// TODO:
// * Automatic scrolling for console and log views
-// * Keyboard shortcuts in error log and devices windows
+// * Keyboard shortcuts in error log and device windows
// * Don't accept keyboard input while the game is running
// * Interior focus rings - standard/exterior focus rings look really ugly here
-// * Improve automatic window sizing - it isn't working all that well
// * Updates causing debug views' widths to change are sometimes obscured by the scroll views' opaque backgrounds
// * Scroll views with content narrower than clipping area are flaky under Tiger - nothing I can do about this
diff --git a/src/osd/modules/debugger/osx/debugview.m b/src/osd/modules/debugger/osx/debugview.m
index 52c34077546..cc5ad4f24aa 100644
--- a/src/osd/modules/debugger/osx/debugview.m
+++ b/src/osd/modules/debugger/osx/debugview.m
@@ -264,8 +264,8 @@ static void debugwin_view_update(debug_view &view, void *osdprivate)
- (NSSize)maximumFrameSize {
debug_view_xy const max = view->total_size();
- return NSMakeSize((max.x * fontWidth) + (2 * [textContainer lineFragmentPadding]),
- max.y * fontHeight);
+ return NSMakeSize(ceil((max.x * fontWidth) + (2 * [textContainer lineFragmentPadding])),
+ ceil(max.y * fontHeight));
}
diff --git a/src/osd/modules/debugger/osx/disassemblyview.m b/src/osd/modules/debugger/osx/disassemblyview.m
index 6f7eec6e5d5..12c3f540675 100644
--- a/src/osd/modules/debugger/osx/disassemblyview.m
+++ b/src/osd/modules/debugger/osx/disassemblyview.m
@@ -101,7 +101,8 @@
max.y = MAX(max.y, current.y);
}
view->set_source(*source);
- return NSMakeSize(max.x * fontWidth, max.y * fontHeight);
+ return NSMakeSize(ceil((max.x * fontWidth) + (2 * [textContainer lineFragmentPadding])),
+ ceil(max.y * fontHeight));
}
diff --git a/src/osd/modules/debugger/osx/memoryview.m b/src/osd/modules/debugger/osx/memoryview.m
index be2cf107535..ff6e827f22e 100644
--- a/src/osd/modules/debugger/osx/memoryview.m
+++ b/src/osd/modules/debugger/osx/memoryview.m
@@ -66,7 +66,8 @@
max.y = MAX(max.y, current.y);
}
view->set_source(*source);
- return NSMakeSize(max.x * fontWidth, max.y * fontHeight);
+ return NSMakeSize(ceil((max.x * fontWidth) + (2 * [textContainer lineFragmentPadding])),
+ ceil(max.y * fontHeight));
}