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()
|
TBarApp::TBarApp()
|
||||||
: BApplication(kDeskbarSignature),
|
:
|
||||||
fSettingsFile(NULL),
|
BApplication(kDeskbarSignature),
|
||||||
fClockSettingsFile(NULL),
|
fSettingsFile(NULL),
|
||||||
fPreferencesWindow(NULL)
|
fClockSettingsFile(NULL),
|
||||||
|
fPreferencesWindow(NULL)
|
||||||
{
|
{
|
||||||
InitSettings();
|
InitSettings();
|
||||||
InitIconPreloader();
|
InitIconPreloader();
|
||||||
@@ -585,6 +586,7 @@ TBarApp::MessageReceived(BMessage* message)
|
|||||||
|
|
||||||
if (fPreferencesWindow != NULL)
|
if (fPreferencesWindow != NULL)
|
||||||
fPreferencesWindow->PostMessage(kUpdatePreferences);
|
fPreferencesWindow->PostMessage(kUpdatePreferences);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -952,22 +954,24 @@ 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),
|
:
|
||||||
flags(flags),
|
teams(teams),
|
||||||
sig(sig),
|
flags(flags),
|
||||||
icon(icon),
|
sig(sig),
|
||||||
name(name)
|
icon(icon),
|
||||||
|
name(name)
|
||||||
{
|
{
|
||||||
_Init();
|
_Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BarTeamInfo::BarTeamInfo(const BarTeamInfo &info)
|
BarTeamInfo::BarTeamInfo(const BarTeamInfo &info)
|
||||||
: teams(new BList(*info.teams)),
|
:
|
||||||
flags(info.flags),
|
teams(new BList(*info.teams)),
|
||||||
sig(strdup(info.sig)),
|
flags(info.flags),
|
||||||
icon(new BBitmap(*info.icon)),
|
sig(strdup(info.sig)),
|
||||||
name(strdup(info.name))
|
icon(new BBitmap(*info.icon)),
|
||||||
|
name(strdup(info.name))
|
||||||
{
|
{
|
||||||
_Init();
|
_Init();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
||||||
// attempt to start DnD tracking
|
if (message != NULL && buttons != 0) {
|
||||||
if (message && buttons != 0) {
|
// attempt to start DnD tracking
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,12 +47,13 @@ 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)),
|
:
|
||||||
fWidth(width),
|
BMenuItem(menu, new BMessage(B_REFS_RECEIVED)),
|
||||||
fHeight(height),
|
fWidth(width),
|
||||||
fInExpando(inexpando),
|
fHeight(height),
|
||||||
fIcon(icon)
|
fInExpando(expando),
|
||||||
|
fIcon(icon)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,4 +70,4 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif /* BARMENUTITLE_H */
|
#endif // BARMENUTITLE_H
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
@@ -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();
|
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);
|
||||||
|
|||||||
@@ -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)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user