Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style fixes and automatic whitespace cleanup. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31570 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent 2009-07-14 22:28:35 +00:00
parent 8856fd5fcf
commit 9e1a62419e
3 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/apps/debugger/gui/team_window/SourceView.cpp
View File

@ -201,7 +201,7 @@ class SourceView::TextView : public BaseView {
public: public:
TextView(SourceView* sourceView, TextView(SourceView* sourceView,
FontInfo* fontInfo); FontInfo* fontInfo);
void CopySelectionToClipboard() const; void CopySelectionToClipboard() const;
virtual void SetSourceCode(SourceCode* sourceCode); virtual void SetSourceCode(SourceCode* sourceCode);
@ -210,14 +210,14 @@ public:
virtual BSize MaxSize(); virtual BSize MaxSize();
virtual void Draw(BRect updateRect); virtual void Draw(BRect updateRect);
virtual void KeyDown(const char* bytes, int32 numBytes); virtual void KeyDown(const char* bytes, int32 numBytes);
virtual void MakeFocus(bool isFocused); virtual void MakeFocus(bool isFocused);
virtual void MouseDown(BPoint where); virtual void MouseDown(BPoint where);
virtual void MouseMoved(BPoint where, uint32 transit, virtual void MouseMoved(BPoint where, uint32 transit,
const BMessage* dragMessage); const BMessage* dragMessage);
virtual void MouseUp(BPoint where); virtual void MouseUp(BPoint where);
private: private:
struct SelectionPoint struct SelectionPoint
{ {
@ -226,7 +226,7 @@ private:
line = _line; line = _line;
offset = _offset; offset = _offset;
} }
int32 line; int32 line;
int32 offset; int32 offset;
}; };
@ -236,9 +236,9 @@ private:
BString& formattedLine); BString& formattedLine);
SelectionPoint _SelectionPointAt(BPoint where) const; SelectionPoint _SelectionPointAt(BPoint where) const;
void _GetSelectionRegion(BRegion& region) const; void _GetSelectionRegion(BRegion& region) const;
private: private:
float fMaxLineWidth; float fMaxLineWidth;
float fCharacterWidth; float fCharacterWidth;
SelectionPoint fSelectionStart; SelectionPoint fSelectionStart;
@ -886,7 +886,7 @@ SourceView::TextView::Draw(BRect updateRect)
_FormatLine(fSourceCode->LineAt(i), lineString); _FormatLine(fSourceCode->LineAt(i), lineString);
DrawString(lineString, BPoint(kLeftTextMargin, y)); DrawString(lineString, BPoint(kLeftTextMargin, y));
} }
if (fSelectionStart.line != -1 && fSelectionEnd.line != -1) { if (fSelectionStart.line != -1 && fSelectionEnd.line != -1) {
PushState(); PushState();
BRegion selectionRegion; BRegion selectionRegion;
@ -910,30 +910,30 @@ SourceView::TextView::KeyDown(const char* bytes, int32 numBytes)
case B_UP_ARROW: case B_UP_ARROW:
vertical->SetValue(value - fFontInfo->lineHeight); vertical->SetValue(value - fFontInfo->lineHeight);
break; break;
case B_DOWN_ARROW: case B_DOWN_ARROW:
vertical->SetValue(value + fFontInfo->lineHeight); vertical->SetValue(value + fFontInfo->lineHeight);
break; break;
case B_PAGE_UP: case B_PAGE_UP:
vertical->SetValue(value - fSourceView->Frame().Size().height); vertical->SetValue(value - fSourceView->Frame().Size().height);
break; break;
case B_PAGE_DOWN: case B_PAGE_DOWN:
vertical->SetValue(value + fSourceView->Frame().Size().height); vertical->SetValue(value + fSourceView->Frame().Size().height);
break; break;
case B_HOME: case B_HOME:
vertical->SetValue(0.0); vertical->SetValue(0.0);
break; break;
case B_END: case B_END:
float min, max; float min, max;
vertical->GetRange(&min, &max); vertical->GetRange(&min, &max);
vertical->SetValue(max); vertical->SetValue(max);
break; break;
} }
SourceView::BaseView::KeyDown(bytes, numBytes); SourceView::BaseView::KeyDown(bytes, numBytes);
} }
@ -951,9 +951,9 @@ void
SourceView::TextView::MouseDown(BPoint where) SourceView::TextView::MouseDown(BPoint where)
{ {
if (fSourceCode != NULL) { if (fSourceCode != NULL) {
if (!IsFocus()) if (!IsFocus())
MakeFocus(true); MakeFocus(true);
// don't reset the selection if the user clicks within the // don't reset the selection if the user clicks within the
// current selection range // current selection range
BRegion region; BRegion region;
@ -970,9 +970,8 @@ SourceView::TextView::MouseDown(BPoint where)
void void
SourceView::TextView::MouseMoved(BPoint where, uint32 transit, SourceView::TextView::MouseMoved(BPoint where, uint32 transit,
const BMessage* dragMessage) const BMessage* dragMessage)
{ {
if (fSelectionMode) { if (fSelectionMode) {
BRegion oldRegion; BRegion oldRegion;
@ -1053,7 +1052,8 @@ SourceView::TextView::SelectionPoint
SourceView::TextView::_SelectionPointAt(BPoint where) const SourceView::TextView::_SelectionPointAt(BPoint where) const
{ {
int32 line = LineAtOffset(where.y); int32 line = LineAtOffset(where.y);
int32 offset = (int32)max_c((where.x - kLeftTextMargin) / fCharacterWidth, 0); int32 offset = (int32)max_c((where.x - kLeftTextMargin)
/ fCharacterWidth, 0);
int32 lineLength = strlen(fSourceCode->LineAt(line)); int32 lineLength = strlen(fSourceCode->LineAt(line));
if (offset > lineLength) if (offset > lineLength)
offset = (lineLength > 0) ? lineLength - 1 : 0; offset = (lineLength > 0) ? lineLength - 1 : 0;
@ -1068,7 +1068,7 @@ SourceView::TextView::_GetSelectionRegion(BRegion &region) const
return; return;
BRect selectionRect; BRect selectionRect;
if (fSelectionStart.line == fSelectionEnd.line) { if (fSelectionStart.line == fSelectionEnd.line) {
if (fSelectionStart.offset != fSelectionEnd.offset) { if (fSelectionStart.offset != fSelectionEnd.offset) {
selectionRect.left = fSelectionStart.offset * fCharacterWidth; selectionRect.left = fSelectionStart.offset * fCharacterWidth;
@ -1079,21 +1079,23 @@ SourceView::TextView::_GetSelectionRegion(BRegion &region) const
} }
} else { } else {
// add rect for starting line // add rect for starting line
selectionRect.left = selectionRect.left = fSelectionStart.offset selectionRect.left = selectionRect.left = fSelectionStart.offset
* fCharacterWidth; * fCharacterWidth;
selectionRect.top = fSelectionStart.line * fFontInfo->lineHeight; selectionRect.top = fSelectionStart.line * fFontInfo->lineHeight;
selectionRect.right = Bounds().right; selectionRect.right = Bounds().right;
selectionRect.bottom = selectionRect.top + fFontInfo->lineHeight; selectionRect.bottom = selectionRect.top + fFontInfo->lineHeight;
region.Include(selectionRect); region.Include(selectionRect);
// compute rect for all lines in middle of selection // compute rect for all lines in middle of selection
if (fSelectionEnd.line - fSelectionStart.line > 1) { if (fSelectionEnd.line - fSelectionStart.line > 1) {
selectionRect.left = 0.0; selectionRect.left = 0.0;
selectionRect.top = (fSelectionStart.line + 1) selectionRect.top = (fSelectionStart.line + 1)
* fFontInfo->lineHeight; * fFontInfo->lineHeight;
selectionRect.right = Bounds().right; selectionRect.right = Bounds().right;
selectionRect.bottom = fSelectionEnd.line * fFontInfo->lineHeight; selectionRect.bottom = fSelectionEnd.line * fFontInfo->lineHeight;
region.Include(selectionRect); region.Include(selectionRect);
} }
// add rect for last line (if needed) // add rect for last line (if needed)
if (fSelectionEnd.offset > 0) { if (fSelectionEnd.offset > 0) {
selectionRect.left = 0.0; selectionRect.left = 0.0;
@ -1112,17 +1114,17 @@ SourceView::TextView::CopySelectionToClipboard(void) const
{ {
if (fSelectionStart.line == -1 || fSelectionEnd.line == -1) if (fSelectionStart.line == -1 || fSelectionEnd.line == -1)
return; return;
BString text; BString text;
if (fSelectionStart.line == fSelectionEnd.line) if (fSelectionStart.line == fSelectionEnd.line) {
text.SetTo(fSourceCode->LineAt(fSelectionStart.line) text.SetTo(fSourceCode->LineAt(fSelectionStart.line)
+ fSelectionStart.offset, fSelectionEnd.offset + fSelectionStart.offset, fSelectionEnd.offset
- fSelectionStart.offset); - fSelectionStart.offset);
else { } else {
text.SetTo(fSourceCode->LineAt(fSelectionStart.line) text.SetTo(fSourceCode->LineAt(fSelectionStart.line)
+ fSelectionStart.offset); + fSelectionStart.offset);
text << "\n"; text << "\n";
for (int32 i = fSelectionStart.line + 1; i < fSelectionEnd.line; i++) for (int32 i = fSelectionStart.line + 1; i < fSelectionEnd.line; i++)
text << fSourceCode->LineAt(i) << "\n"; text << fSourceCode->LineAt(i) << "\n";
text.Append(fSourceCode->LineAt(fSelectionEnd.line), text.Append(fSourceCode->LineAt(fSelectionEnd.line),
fSelectionEnd.offset); fSelectionEnd.offset);
@ -1130,11 +1132,10 @@ SourceView::TextView::CopySelectionToClipboard(void) const
be_clipboard->Lock(); be_clipboard->Lock();
be_clipboard->Data()->RemoveData("text/plain"); be_clipboard->Data()->RemoveData("text/plain");
be_clipboard->Data()->AddData ("text/plain", be_clipboard->Data()->AddData ("text/plain",
B_MIME_TYPE, text.String(), text.Length()); B_MIME_TYPE, text.String(), text.Length());
be_clipboard->Commit(); be_clipboard->Commit();
be_clipboard->Unlock(); be_clipboard->Unlock();
} }
@ -1323,8 +1324,8 @@ printf(" -> scrolling to (%f, %f)\n", visible.left, top - (visible.Height() + 1
void void
SourceView::HighlightBorder(bool state) SourceView::HighlightBorder(bool state)
{ {
BScrollView *parent = dynamic_cast<BScrollView *>(Parent()); BScrollView* parent = dynamic_cast<BScrollView*>(Parent());
if (parent) if (parent != NULL)
parent->SetBorderHighlighted(state); parent->SetBorderHighlighted(state);
} }
@ -1337,14 +1338,14 @@ SourceView::TargetedByScrollView(BScrollView* scrollView)
void void
SourceView::MessageReceived(BMessage *message) SourceView::MessageReceived(BMessage* message)
{ {
switch (message->what) switch (message->what)
{ {
case B_COPY: case B_COPY:
fTextView->CopySelectionToClipboard(); fTextView->CopySelectionToClipboard();
break; break;
default: default:
BView::MessageReceived(message); BView::MessageReceived(message);
break; break;

3
src/apps/debugger/gui/team_window/SourceView.h
View File

@ -46,7 +46,7 @@ public:
void HighlightBorder(bool state); void HighlightBorder(bool state);
virtual void TargetedByScrollView(BScrollView* scrollView); virtual void TargetedByScrollView(BScrollView* scrollView);
virtual void MessageReceived(BMessage *message); virtual void MessageReceived(BMessage *message);
virtual BSize MinSize(); virtual BSize MinSize();
virtual BSize MaxSize(); virtual BSize MaxSize();
virtual BSize PreferredSize(); virtual BSize PreferredSize();
@ -64,7 +64,6 @@ private:
float lineHeight; float lineHeight;
}; };
private: private:
void _Init(); void _Init();
void _UpdateScrollBars(); void _UpdateScrollBars();

4
src/apps/debugger/gui/team_window/TeamWindow.cpp
View File

@ -391,9 +391,9 @@ TeamWindow::_Init()
fStepOutButton->SetTarget(this); fStepOutButton->SetTarget(this);
// add menus and menu items // add menus and menu items
BMenu *menu = new BMenu("File"); BMenu* menu = new BMenu("File");
fMenuBar->AddItem(menu); fMenuBar->AddItem(menu);
BMenuItem *item = new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED), BMenuItem* item = new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED),
'Q'); 'Q');
menu->AddItem(item); menu->AddItem(item);
item->SetTarget(this); item->SetTarget(this);