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

Automatic whitespace cleanup and coding style.

Browse Source
This commit is contained in:
Humdinger 2012-07-01 18:58:43 +02:00
parent e0ef5b2a97
commit 62115b4772
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/preferences/media/MediaListItem.cpp
View File

@ -2,7 +2,7 @@
//
// Copyright (c) 2003, OpenBeOS
//
// This software is part of the OpenBeOS distribution and is covered
// This software is part of the OpenBeOS distribution and is covered
// by the OpenBeOS license.
//
//
@ -10,7 +10,7 @@
// Author: Sikosis, Jérôme Duval
// Description: Media Preferences
// Created : June 25, 2003
//
//
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
#include "MediaListItem.h"
@ -70,13 +70,13 @@ struct MediaListItem::Renderer {
{
fDoubleInsets = doubleInset;
}
void Render(BView* onto, BRect frame, bool complete = false)
{
const rgb_color lowColor = onto->LowColor();
const rgb_color highColor = onto->HighColor();
const rgb_color kBlack = {0, 0, 0, 255};
if (fSelected || complete) {
if (fSelected)
onto->SetLowColor(tint_color(lowColor, B_DARKEN_2_TINT));
@ -86,7 +86,7 @@ struct MediaListItem::Renderer {
frame.left += 4;
frame.top += kITEM_MARGIN;
BRect iconFrame(MediaIcons::IconRectAt(frame.LeftTop() + BPoint(1, 0)));
onto->SetDrawingMode(B_OP_OVER);
if (fPrimaryIcon && !fDoubleInsets) {
onto->DrawBitmap(fPrimaryIcon, iconFrame);
@ -103,7 +103,7 @@ struct MediaListItem::Renderer {
onto->SetDrawingMode(B_OP_COPY);
onto->SetHighColor(kBlack);
BFont font = be_plain_font;
font_height fontInfo;
font.GetHeight(&fontInfo);
@ -130,7 +130,7 @@ struct MediaListItem::Renderer {
width += iconSpace;
width += 8.0f;
// space between icons and text
width += be_plain_font->StringWidth(fTitle) + 3.0f;
return width;
}

7
src/preferences/media/MediaWindow.cpp
View File

@ -413,11 +413,10 @@ MediaWindow::InitWindow()
// Start the window
fInitCheck = InitMedia(true);
if (fInitCheck != B_OK) {
if (fInitCheck != B_OK)
PostMessage(B_QUIT_REQUESTED);
} else if (IsHidden()) {
else if (IsHidden())
Show();
}
}
@ -753,7 +752,7 @@ MediaWindow::_MakeEmptyParamView()
B_ALIGN_VERTICAL_CENTER);
stringView->SetExplicitAlignment(centered);
stringView->SetAlignment(B_ALIGN_CENTER);
fContentLayout->AddView(stringView);
fContentLayout->SetVisibleItem(fContentLayout->CountItems() - 1);