Style fixes only

Most indentation and newlines with a few comment updates
This commit is contained in:
John Scipione
2013-04-14 02:49:29 -04:00
parent 10a5b6946c
commit fe624b3937
9 changed files with 36 additions and 26 deletions
+7 -3
View File
@@ -92,7 +92,8 @@ main()
TBarApp::TBarApp() TBarApp::TBarApp()
: BApplication(kDeskbarSignature), :
BApplication(kDeskbarSignature),
fSettingsFile(NULL), fSettingsFile(NULL),
fClockSettingsFile(NULL), fClockSettingsFile(NULL),
fPreferencesWindow(NULL) fPreferencesWindow(NULL)
@@ -585,6 +586,7 @@ TBarApp::MessageReceived(BMessage* message)
if (fPreferencesWindow != NULL) if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences); fPreferencesWindow->PostMessage(kUpdatePreferences);
break; break;
} }
@@ -952,7 +954,8 @@ TBarApp::IconRect()
BarTeamInfo::BarTeamInfo(BList* teams, uint32 flags, char* sig, BBitmap* icon, BarTeamInfo::BarTeamInfo(BList* teams, uint32 flags, char* sig, BBitmap* icon,
char* name) char* name)
: teams(teams), :
teams(teams),
flags(flags), flags(flags),
sig(sig), sig(sig),
icon(icon), icon(icon),
@@ -963,7 +966,8 @@ BarTeamInfo::BarTeamInfo(BList* teams, uint32 flags, char* sig, BBitmap* icon,
BarTeamInfo::BarTeamInfo(const BarTeamInfo &info) BarTeamInfo::BarTeamInfo(const BarTeamInfo &info)
: teams(new BList(*info.teams)), :
teams(new BList(*info.teams)),
flags(info.flags), flags(info.flags),
sig(strdup(info.sig)), sig(strdup(info.sig)),
icon(new BBitmap(*info.icon)), icon(new BBitmap(*info.icon)),
+2 -1
View File
@@ -221,14 +221,15 @@ TBarMenuBar::MouseMoved(BPoint where, uint32 code, const BMessage* message)
BPoint loc; BPoint loc;
uint32 buttons; uint32 buttons;
GetMouse(&loc, &buttons); GetMouse(&loc, &buttons);
if (message != NULL && buttons != 0) {
// attempt to start DnD tracking // attempt to start DnD tracking
if (message && buttons != 0) {
fBarView->CacheDragData(const_cast<BMessage*>(message)); fBarView->CacheDragData(const_cast<BMessage*>(message));
MouseDown(loc); MouseDown(loc);
} }
break; break;
} }
} }
BMenuBar::MouseMoved(where, code, message); BMenuBar::MouseMoved(where, code, message);
} }
+4 -3
View File
@@ -47,11 +47,12 @@ All rights reserved.
TBarMenuTitle::TBarMenuTitle(float width, float height, const BBitmap* icon, TBarMenuTitle::TBarMenuTitle(float width, float height, const BBitmap* icon,
BMenu* menu, bool inexpando) BMenu* menu, bool expando)
: BMenuItem(menu, new BMessage(B_REFS_RECEIVED)), :
BMenuItem(menu, new BMessage(B_REFS_RECEIVED)),
fWidth(width), fWidth(width),
fHeight(height), fHeight(height),
fInExpando(inexpando), fInExpando(expando),
fIcon(icon) fIcon(icon)
{ {
} }
+1 -1
View File
@@ -70,4 +70,4 @@ private:
}; };
#endif /* BARMENUTITLE_H */ #endif // BARMENUTITLE_H
+1 -1
View File
@@ -519,7 +519,7 @@ TBarView::PlaceApplicationBar()
SizeWindow(screenFrame); SizeWindow(screenFrame);
PositionWindow(screenFrame); PositionWindow(screenFrame);
fExpandoMenuBar->DoLayout(); fExpandoMenuBar->DoLayout();
// force menu to autosize // force menu to resize
CheckForScrolling(); CheckForScrolling();
Window()->UpdateIfNeeded(); Window()->UpdateIfNeeded();
Invalidate(); Invalidate();
+1 -1
View File
@@ -234,4 +234,4 @@ TBarView::CachedTypesList() const
} }
#endif /* BARVIEW_H */ #endif // BARVIEW_H
+1
View File
@@ -100,6 +100,7 @@ TBarWindow::TBarWindow()
desk_settings* settings = ((TBarApp*)be_app)->Settings(); desk_settings* settings = ((TBarApp*)be_app)->Settings();
if (settings->alwaysOnTop) if (settings->alwaysOnTop)
SetFeel(B_FLOATING_ALL_WINDOW_FEEL); SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
fBarView = new TBarView(Bounds(), settings->vertical, settings->left, fBarView = new TBarView(Bounds(), settings->vertical, settings->left,
settings->top, settings->state, settings->width); settings->top, settings->state, settings->width);
AddChild(fBarView); AddChild(fBarView);
+2 -1
View File
@@ -88,7 +88,8 @@ using namespace BPrivate;
TDeskbarMenu::TDeskbarMenu(TBarView* barView) TDeskbarMenu::TDeskbarMenu(TBarView* barView)
: BNavMenu("DeskbarMenu", B_REFS_RECEIVED, DefaultTarget()), :
BNavMenu("DeskbarMenu", B_REFS_RECEIVED, DefaultTarget()),
fAddState(kStart), fAddState(kStart),
fBarView(barView) fBarView(barView)
{ {
+2
View File
@@ -190,6 +190,7 @@ TTeamMenuItem::Draw()
{ {
BRect frame(Frame()); BRect frame(Frame());
BMenu* menu = Menu(); BMenu* menu = Menu();
menu->PushState(); menu->PushState();
rgb_color menuColor = menu->LowColor(); rgb_color menuColor = menu->LowColor();
@@ -224,6 +225,7 @@ TTeamMenuItem::Draw()
menu->MovePenTo(ContentLocation()); menu->MovePenTo(ContentLocation());
DrawContent(); DrawContent();
menu->PopState(); menu->PopState();
} }