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