i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix build of Debugger with gcc2

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42197 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2011-06-15 20:25:50 +00:00
parent 916c873ba3
commit 8d22d5a76b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/user_interface/gui/inspector_window/MemoryView.cpp
+5 -4
View File
@@ -100,8 +100,8 @@ MemoryView::Draw(BRect rect)
char buffer[16]; char buffer[16];
int32 startLine = rect.top / fLineHeight; int32 startLine = int32(rect.top / fLineHeight);
int32 endLine = rect.bottom / fLineHeight + 1; int32 endLine = int32(rect.bottom / fLineHeight) + 1;
int32 startByte = fNybblesPerLine / 2 * startLine; int32 startByte = fNybblesPerLine / 2 * startLine;
uint16* currentAddress = (uint16*)(fTargetBlock->BaseAddress() uint16* currentAddress = (uint16*)(fTargetBlock->BaseAddress()
+ startByte); + startByte);
@@ -174,14 +174,15 @@ MemoryView::_RecalcScrollBars()
BScrollBar *scrollBar = ScrollBar(B_VERTICAL); BScrollBar *scrollBar = ScrollBar(B_VERTICAL);
if (fTargetBlock != NULL) { if (fTargetBlock != NULL) {
BRect bounds = Bounds(); BRect bounds = Bounds();
fNybblesPerLine = bounds.Width() / fCharWidth; fNybblesPerLine = int32(bounds.Width() / fCharWidth);
// we allocate 8 characters for the starting address of the current // we allocate 8 characters for the starting address of the current
// line plus some spacing to separate that from the data // line plus some spacing to separate that from the data
fNybblesPerLine -= 10; fNybblesPerLine -= 10;
// also allocate a space between each 16-bit grouping // also allocate a space between each 16-bit grouping
fNybblesPerLine -= (fNybblesPerLine / 4) - 1; fNybblesPerLine -= (fNybblesPerLine / 4) - 1;
fNybblesPerLine &= ~3; fNybblesPerLine &= ~3;
int32 lineCount = ceil(2 * fTargetBlock->Size() / fNybblesPerLine); int32 lineCount
= (int32)ceil(2 * fTargetBlock->Size() / fNybblesPerLine);
float totalHeight = lineCount * fLineHeight; float totalHeight = lineCount * fLineHeight;
max = totalHeight - bounds.Height(); max = totalHeight - bounds.Height();
scrollBar->SetProportion(bounds.Height() / totalHeight); scrollBar->SetProportion(bounds.Height() / totalHeight);